diff --git a/config/config-session.el b/config/config-session.el
index 9711a00cf..ec60f7d7b 100644
--- a/config/config-session.el
+++ b/config/config-session.el
@@ -18,6 +18,8 @@
 (require 'saveplace)
 (setq-default save-place t)
 (setq save-place-file (expand-file-name ".places" user-emacs-directory))
+;; keep buffers opened when leaving an emacs client
+(setq server-kill-new-buffers nil)
 
 ;; ;; save a bunch of variables to the desktop file
 ;; ;; for lists specify the len of the maximal saved data also