diff --git a/home/wm/addon/auth-agent.nix b/home/wm/addon/auth-agent.nix
new file mode 100644
index 0000000..dc82467
--- /dev/null
+++ b/home/wm/addon/auth-agent.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+let
+  agent = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+in
+{
+  systemd.user = {
+    services.auth-agent = {
+      Unit = {
+        Description = "Polkit AUthentication Agent";
+        PartOf = [ "graphical-session.target" ];
+        After = [ "graphical-session-pre.target" ];
+      };
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+      Service = {
+        ExecStart = "${agent}";
+        Restart = "on-failure";
+      };
+    };
+  };
+}
diff --git a/home/wm/addon/default.nix b/home/wm/addon/default.nix
index 620bb70..04cd009 100644
--- a/home/wm/addon/default.nix
+++ b/home/wm/addon/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./rofi
     ./waybar
+    ./auth-agent.nix
     ./dunst.nix
     ./kanshi.nix
     ./swayidle.nix
diff --git a/home/wm/hyprland/default.nix b/home/wm/hyprland/default.nix
index 233b8f4..1d994cf 100644
--- a/home/wm/hyprland/default.nix
+++ b/home/wm/hyprland/default.nix
@@ -136,7 +136,6 @@ in
 
       exec-once = [
         "${hyprctl} setcursor ${config.gtk.cursorTheme.name} 24"
-        "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
       ];
 
       bindm = [