diff --git a/roles/desktop/configuration.nix b/roles/desktop/configuration.nix
index 4348234..02fc317 100644
--- a/roles/desktop/configuration.nix
+++ b/roles/desktop/configuration.nix
@@ -22,5 +22,7 @@
   hardware.keyboard.qmk.enable = true;
   home-manager.users.toast.home.packages = [pkgs.qmk];
 
+  home-manager.users.toast.xdg.autostart.enable = true;
+
   boot.plymouth.enable = true;
 }
diff --git a/roles/desktop/programs/keepassxc.nix b/roles/desktop/programs/keepassxc.nix
index ad2dbb2..fd5321a 100644
--- a/roles/desktop/programs/keepassxc.nix
+++ b/roles/desktop/programs/keepassxc.nix
@@ -34,30 +34,11 @@ in {
       # No module for KeePassXC config :(
       home = {
         packages = [pkgs.keepassxc];
-        file = {
-          ".config/keepassxc/keepassxc.ini".text = kpxcSettings;
-          # For some reason the autostart .desktop is not the same as the regular one
-          ".config/autostart/org.keepassxc.KeePassXC.desktop".text = ''
-            [Desktop Entry]
-            Name=KeePassXC
-            GenericName=Password Manager
-            Exec=keepassxc
-            TryExec=keepassxc
-            Icon=keepassxc
-            StartupWMClass=keepassxc
-            StartupNotify=true
-            Terminal=false
-            Type=Application
-            Version=1.0
-            Categories=Utility;Security;Qt;
-            MimeType=application/x-keepass2;
-            X-GNOME-Autostart-enabled=true
-            X-GNOME-Autostart-Delay=2
-            X-KDE-autostart-after=panel
-            X-LXQt-Need-Tray=true
-          '';
-        };
+        file.".config/keepassxc/keepassxc.ini".text = kpxcSettings;
       };
+      xdg.autostart.entries = [
+        "${pkgs.keepassxc}/share/applications/org.keepassxc.KeePassXC.desktop"
+      ];
     };
   };
 }