diff --git a/home/macbook-nixos.nix b/home/macbook-nixos.nix
index f52a251..2289c30 100644
--- a/home/macbook-nixos.nix
+++ b/home/macbook-nixos.nix
@@ -106,10 +106,6 @@ in
   };
 
   # Autostart
-  xdg.configFile."autostart/polkit.desktop".text = ''
-    ${builtins.readFile "${pkgs.pantheon.pantheon-agent-polkit}/etc/xdg/autostart/io.elementary.desktop.agent-polkit.desktop"}
-    OnlyShowIn=sway;
-  '';
   xdg.configFile."autostart/input-remapper-autoload.desktop".source =
     "${pkgs.input-remapper}/share/applications/input-remapper-autoload.desktop";
 
diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix
index 5d4bf04..6ebea3d 100644
--- a/home/modules/linux/graphical/default.nix
+++ b/home/modules/linux/graphical/default.nix
@@ -167,6 +167,7 @@ in
     qt.style.package = pkgs.adwaita-qt;
     qt.style.name = "adwaita";
 
+
     xdg.configFile =
       let
         f = pkg: {
@@ -184,8 +185,15 @@ in
               "${srcFile}/${pkg.name}.desktop";
           };
         };
+        autoStartup = listToAttrs (map f (cfg.startup ++ alwaysStartup));
       in
-      listToAttrs (map f (cfg.startup ++ alwaysStartup));
+      autoStartup // {
+        ## Polkit UI
+        "autostart/polkit.desktop".text = ''
+          ${builtins.readFile "${pkgs.pantheon.pantheon-agent-polkit}/etc/xdg/autostart/io.elementary.desktop.agent-polkit.desktop"}
+          OnlyShowIn=sway;
+        '';
+      };
     # IBus configuration
     # dconf.settings."desktop/ibus/general" = {
     #   engines-order = hm.gvariant.mkArray hm.gvariant.type.string [ "xkb:jp::jpn" "mozc-jp" "Bamboo" ];