diff --git a/home-manager/linux/programs/sway.nix b/home-manager/linux/programs/sway.nix
index 12cab1b..7fc9775 100644
--- a/home-manager/linux/programs/sway.nix
+++ b/home-manager/linux/programs/sway.nix
@@ -171,11 +171,6 @@ in with lib; {
           "${modifer}+m" =
             "exec sh -c 'swaymsg [app_id=\"Alacritty\"] scratchpad show'";
         };
-        # Startup applications
-        startup = [
-          # Mako, the notification daemon
-          { command = "mako"; }
-        ];
         # Turn on numlock by default
         input = {
           "*" = { xkb_numlock = "enable"; };
@@ -208,6 +203,20 @@ in with lib; {
       defaultTimeout = 0;
       ignoreTimeout = true;
     };
+    systemd.user.services.mako = {
+      Unit = {
+        Description = "mako notification daemon";
+        After = [ "graphical-session.target" ];
+      };
+      Service = {
+        Type = "simple";
+        ExecStart = ''
+          ${pkgs.mako}/bin/mako
+        '';
+        Restart = "always";
+      };
+      Install = { WantedBy = [ "graphical-session.target" ]; };
+    };
     #########################
     ## Swayidle
     #########################