diff --git a/modules/autostart.nix b/modules/autostart.nix
index 5ce9aed..27f188f 100644
--- a/modules/autostart.nix
+++ b/modules/autostart.nix
@@ -3,12 +3,17 @@
 {
   # 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");
+    home.file.signal-desktop = {
+      target = ".config/autostart/" + "signal-desktop" + ".desktop";
+      source = (pkgs.signal-desktop + "/share/applications/" + "signal-desktop" + ".desktop");
     };
+
+    # TODO: This is very strange. But with KeePassXC autostart enabled, `gpg --card-status` does not detect my Nitrokey USB smartcard!
+    #home.file.keepassxc = {
+    #  target = ".config/autostart/" + "org.keepassxc.KeePassXC" + ".desktop";
+    #  source = (pkgs.keepassxc + "/share/applications/" + "org.keepassxc.KeePassXC" + ".desktop");
+    #};
   };
 }