diff --git a/modules/security.nix b/modules/security.nix
index 80092c0..f3a1136 100644
--- a/modules/security.nix
+++ b/modules/security.nix
@@ -58,9 +58,8 @@
 
   services.getty.autologinUser = "balsoft";
 
-  environment.loginShellInit = ''
+  environment.loginShellInit = lib.mkBefore ''
     [[ "$(tty)" == /dev/tty? ]] && sudo /run/current-system/sw/bin/lock this
-    [[ "$(tty)" == /dev/tty1 ]] && sway
   '';
 
   security.pam.u2f = {
diff --git a/modules/workspace/sway/default.nix b/modules/workspace/sway/default.nix
index fcf6026..e4be79c 100755
--- a/modules/workspace/sway/default.nix
+++ b/modules/workspace/sway/default.nix
@@ -22,6 +22,8 @@ in {
 
   users.users.balsoft.extraGroups = [ "sway" ];
 
+  environment.loginShellInit = lib.mkAfter ''[[ "$(tty)" == /dev/tty1 ]] && sway'';
+
   home-manager.users.balsoft.wayland.windowManager.sway = {
     enable = true;
     config = rec {