diff --git a/home-manager/common/programs/emacs.nix b/home-manager/common/programs/emacs.nix
index f903c50..b5553a3 100644
--- a/home-manager/common/programs/emacs.nix
+++ b/home-manager/common/programs/emacs.nix
@@ -45,6 +45,11 @@
           epkgs.pdf-tools
         ];
       };
+      # Set emacs as the editor
+      home.sessionVariables = {
+        EDITOR = "emacsclient -c";
+        VISUAL = "emacsclient -c";
+      };
     }))
     (lib.mkIf (config.nathan.programs.emacs.enable && pkgs.stdenv.isLinux) {
       home.packages = with pkgs;