diff --git a/home-manager/nathan/programs/terminal/zsh/default.nix b/home-manager/nathan/programs/terminal/zsh/default.nix
index b2107a9..5fdd097 100644
--- a/home-manager/nathan/programs/terminal/zsh/default.nix
+++ b/home-manager/nathan/programs/terminal/zsh/default.nix
@@ -32,12 +32,6 @@
       share = true;
     };
 
-    loginExtra = ''
-        if uwsm check may-start; then
-            exec uwsm start hyprland-uwsm.desktop
-        fi
-    '';
-
     initExtraFirst = ''
       cat ${config.home.homeDirectory}/.cache/wal/sequences
       eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)"
diff --git a/system-config/configuration/homebox/default.nix b/system-config/configuration/homebox/default.nix
index a607063..42021e8 100644
--- a/system-config/configuration/homebox/default.nix
+++ b/system-config/configuration/homebox/default.nix
@@ -231,6 +231,20 @@
             rofi.enable = true;
             firefox.enable = true;
           };
+
+          systemd.user.services.hyprland-autostart = {
+            Unit = {
+                Description = "Autostart Hyprland";
+            };
+
+            Service = {
+                ExecStart = "uwsm start hyprland-uwsm.desktop";
+            };
+
+            Install = {
+                WantedBy = "default.target";
+            };
+          };
         }
       ];
     };