diff --git a/hm/hyprland.nix b/hm/hyprland.nix
index 2807125..f4e43b6 100644
--- a/hm/hyprland.nix
+++ b/hm/hyprland.nix
@@ -109,7 +109,6 @@ in
       ];
 
       exec-once = [
-        "waybar"
         # "hyprpaper"
         # "swww init"
       ];
diff --git a/hm/waybar.nix b/hm/waybar.nix
index b068d9a..b10402f 100644
--- a/hm/waybar.nix
+++ b/hm/waybar.nix
@@ -18,6 +18,11 @@ let
   swaync-client = "${pkgs.swaynotificationcenter}/bin/swaync-client";
 in
 {
+  systemd.user.services.waybar = {
+    Unit.PartOf = [ "tray.target" ];
+    Install.WantedBy = [ "tray.target" ];
+    Service = { Restart = "on-failure"; RestartSec = "3s"; };
+  };
   home.packages = [ pkgs.swaynotificationcenter ];
   programs.waybar = {
     enable = true;