diff --git a/users/simon/modules/sway.nix b/users/simon/modules/sway.nix
index b060da8..36e7e71 100644
--- a/users/simon/modules/sway.nix
+++ b/users/simon/modules/sway.nix
@@ -215,8 +215,6 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
     extraConfig = ''
       # Cursor
       seat seat0 xcursor_theme Adwaita
-
-      exec ${pkgs.mako}/bin/mako
     '';
 
     extraSessionCommands = ''
@@ -499,6 +497,16 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
     defaultTimeout = 5000;
   };
 
+  systemd.user.services.mako = {
+    Unit.PartOf = [ "sway-session.target" ];
+    Install.WantedBy = [ "sway-session.target" ];
+
+    Service = {
+      ExecStart = "${pkgs.mako}/bin/mako";
+      Restart = "on-failure";
+    };
+  };
+
   services.redshift = {
     enable = true;
     package = pkgs.redshift-wlr;