diff --git a/system/home/emacs/default.nix b/system/home/emacs/default.nix
index d2251d6f..4a10647a 100644
--- a/system/home/emacs/default.nix
+++ b/system/home/emacs/default.nix
@@ -1,4 +1,6 @@
 {
+  config,
+  lib,
   pkgs,
   config,
   ...
@@ -11,9 +13,12 @@
     ../texlive/default.nix
     ../programming/default.nix
   ];
-  home.sessionVariables = with config.programs; {
-    EDITOR = "${emacs.finalPackage}/bin/emacs -nw";
-    VISUAL = "${emacs.finalPackage}/bin/emacs";
+  services.emacs = {
+    enable = lib.mkDefault true;
+    package = config.programs.emacs.finalPackage;
+    defaultEditor = true;
+    client.enable = true;
+    socketActivation.enable = true;
   };
   programs.emacs = {
     enable = true;
diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix
index a30fd32d..2034a4a5 100644
--- a/system/home/hyprland.nix
+++ b/system/home/hyprland.nix
@@ -347,7 +347,7 @@
           # Common program shortcuts
           "SUPER, D, exec, ${config.programs.fuzzel.package}/bin/fuzzel"
           "SUPER, C, exec, ${config.programs.alacritty.package}/bin/alacritty"
-          "SUPER, E, exec, ${config.programs.emacs.finalPackage}/bin/emacs"
+          "SUPER, E, exec, ${config.programs.emacs.finalPackage}/bin/emacsclient -c"
           "SUPER, W, exec, ${config.programs.firefox.finalPackage}/bin/firefox"
           "SUPER, F, exec, ${pkgs.nautilus}/bin/nautilus"
 
diff --git a/system/mimeapps.nix b/system/mimeapps.nix
index e3e40884..719de9b4 100644
--- a/system/mimeapps.nix
+++ b/system/mimeapps.nix
@@ -1,5 +1,5 @@
 let
-  emacs = [ "emacs.desktop" ];
+  emacs = [ "emacsclient.desktop" ];
   browser = [ "firefox.desktop" ];
 in
 {
@@ -65,7 +65,7 @@ in
   "x-scheme-handler/chrome" = browser;
   "x-scheme-handler/webcal" = browser;
   "x-scheme-handler/geo" = [ "openstreetmap-geo-handler.desktop" ];
-  "x-scheme-handler/mailto" = [ "emacs-mail.desktop" ];
+  "x-scheme-handler/mailto" = [ "emacsclient-mail.desktop" ];
   "x-scheme-handler/unknown" = emacs;
 
   "x-scheme-handler/prusaslicer" = [ "PrusaSlicerURLProtocol.desktop" ];