diff --git a/modules/home/editor/emacs/default.nix b/modules/home/editor/emacs/default.nix
index 4151db1..7ddd07d 100644
--- a/modules/home/editor/emacs/default.nix
+++ b/modules/home/editor/emacs/default.nix
@@ -14,6 +14,10 @@
     services.emacs = {
       enable = true;
       defaultEditor = config.chimera.editor.emacs.defaultEditor;
+      client = {
+        enable = true;
+        arguments = [ "--create-frame" "--alternate-editor=${config.programs.emacs.package}/bin/emacs" ];
+      };
     };
   };
 }