diff --git a/init.el b/init.el
index ffdaa7dc..84e29a81 100644
--- a/init.el
+++ b/init.el
@@ -568,7 +568,10 @@ The current directory is assumed to be the project's root otherwise."
 (use-package edit-server
   :ensure t
   :commands edit-server-start
-  :idle (edit-server-start))
+  :idle (edit-server-start)
+  :config
+  (progn
+    (setq edit-server-new-frame nil)))
 
 (use-package jabber
   :ensure t