diff --git a/home/modules/i3+sway/default.nix b/home/modules/i3+sway/default.nix
index 7511b5a..11826f9 100644
--- a/home/modules/i3+sway/default.nix
+++ b/home/modules/i3+sway/default.nix
@@ -296,6 +296,13 @@ in {
             bg = "${../../wallpapers/metroid-samus-returns-kz-3440x1440.jpg} fill";
           };
         };
+        startup = [
+          # Launch waybar status bar
+          {
+            command = "waybar";
+            always = false;
+          }
+        ];
       };
     in {
       enable = true;
@@ -304,7 +311,7 @@ in {
 
     programs.waybar = {
       enable = true;
-      systemd.enable = true;
+      systemd.enable = false;  # Don't auto-start via systemd - only launch in sway
       settings = {
         mainBar = {
           layer = "top";