diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix
index a917168..b7b193b 100644
--- a/modules/basic-tools/default.nix
+++ b/modules/basic-tools/default.nix
@@ -65,7 +65,9 @@
     let
       editorconf =
         if config.services.emacs.defaultEditor then
-          { }
+          {
+            EDITOR = "emacsclient";
+          }
         else
           {
             EDITOR = "nvim";