diff --git a/modules/sway/config/config.d/custom-keybindings.conf b/modules/sway/config/config.d/custom-keybindings.conf
index 5faddec..d5887e3 100644
--- a/modules/sway/config/config.d/custom-keybindings.conf
+++ b/modules/sway/config/config.d/custom-keybindings.conf
@@ -37,7 +37,7 @@ set $mode_system (l)ock, (e)xit, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutd
 bindsym $mod+0 mode "$mode_system"
 mode "$mode_system" {
     bindsym l exec swaylock-bg, mode "default"
-    bindsym e exec swaymsg exit, mode "default"
+    bindsym e exec systemctl --user stop graphical-session.target, mode "default"
     bindsym s exec systemctl suspend, mode "default"
     bindsym h exec systemctl hibernate, mode "default"
     bindsym r exec systemctl reboot, mode "default"
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index 83f407e..35013dd 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -86,6 +86,7 @@ in
         #programs.waybar.systemd.enable = true;
 
         systemd.user.services.mako = import ./mako.service.nix pkgs;
+        systemd.user.services.sway = import ./sway.service.nix pkgs;
         systemd.user.services.swayidle = import ./swayidle.service.nix pkgs;
         systemd.user.services.xsettingsd = import ./xsettingsd.service.nix pkgs;
         systemd.user.services.waybar = import ./waybar.service.nix pkgs;
diff --git a/modules/terminal-life/zsh/default.nix b/modules/terminal-life/zsh/default.nix
index 91bb422..5cc81ca 100644
--- a/modules/terminal-life/zsh/default.nix
+++ b/modules/terminal-life/zsh/default.nix
@@ -19,7 +19,7 @@ in
   };
 
   loginExtra = ''
-    [ "$(tty)" = "/dev/tty1" ] && exec sway
+    [ "$(tty)" = "/dev/tty1" ] && exec ${pkgs.sway-service}/bin/sway-service
   '';
 
   shellAliases = {