diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index fe16aa1..3a1cffd 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -14,6 +14,7 @@
       ./home-manager.nix
       ../../modules/base.nix
       ../../modules/programs.nix
+      ../../modules/autostart.nix
       ../../modules/fwupd.nix
       ../../modules/print-and-scan.nix
       ../../modules/fde-ssh-unlock.nix
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index 94fea5c..cc77b9c 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -14,6 +14,7 @@
       ./home-manager.nix
       ../../modules/base.nix
       ../../modules/programs.nix
+      ../../modules/autostart.nix
       ../../modules/fwupd.nix
       ../../modules/print-and-scan.nix
       ../../modules/fde-ssh-unlock.nix
diff --git a/modules/autostart.nix b/modules/autostart.nix
new file mode 100644
index 0000000..5ce9aed
--- /dev/null
+++ b/modules/autostart.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # See also:
+  #   Temporary workaround until https://github.com/nix-community/home-manager/issues/3447 is merged.
+  # The keepassxc desktop file is named differently than pkg.name. Thus we add it manually.
+
+  home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
+    home.file.keepassxc = {
+      target = ".config/autostart/" + "org.keepassxc.KeePassXC" + ".desktop";
+      source = (pkgs.keepassxc + "/share/applications/" + "org.keepassxc.KeePassXC" + ".desktop");
+    };
+  };
+}