diff --git a/roles/keepassxc/files/org.keepassxc.KeePassXC.desktop b/roles/keepassxc/files/org.keepassxc.KeePassXC.desktop
new file mode 100644
index 0000000..098d7cc
--- /dev/null
+++ b/roles/keepassxc/files/org.keepassxc.KeePassXC.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Name=KeePassXC
+GenericName=Password Manager
+Exec=/usr/bin/keepassxc
+TryExec=/usr/bin/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
diff --git a/roles/keepassxc/tasks/main.yml b/roles/keepassxc/tasks/main.yml
index c92e15c..b7b4961 100644
--- a/roles/keepassxc/tasks/main.yml
+++ b/roles/keepassxc/tasks/main.yml
@@ -28,3 +28,7 @@
     option: AuthSockOverride
     value: "{{ ssh_agent_socket }}"
     no_extra_spaces: true
+- name: Autostart keepassxc
+  copy:
+    src: "{{ role_path }}/files/org.keepassxc.KeePassXC.desktop"
+    dest: ~/.config/autostart/org.keepassxc.KeePassXC.desktop