diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 48d2d129..22fe009e 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -108,8 +108,7 @@ in ''
   # Common program shortcuts
   bind = SUPER, Space, exec, rofi -replace -show combi
   bind = SUPER, Return, exec, foot
-  bind = SUPER SHIFT, Return, exec, [float] foot
-  bind = SUPER, X, exec, emacsclient -c
+  bind = SUPER, X, exec, emacsclient -c -a "emacs -f server-start"
 
   # Misc useful binds
   bind=,Print,exec,grim -g "$(slurp)"
@@ -255,9 +254,9 @@ in ''
   bindm = SUPER, mouse:272, movewindow
   bindm = SUPER, mouse:273, resizewindow
 
-  exec-once = emacs --fg-daemon
   exec-once = swaync
   exec-once = ${pkgs.hyprpaper}/bin/hyprpaper
   exec-once = ${pkgs.dex}/bin/dex --autostart
   exec-once = [workspace name:btm silent] foot -e btm --group --battery
+  exec-once = [workspace name:editor silent] emacs -f server-start
 ''