diff --git a/modules/nixos/ui/desktops/gnome/default.nix b/modules/nixos/ui/desktops/gnome/default.nix
index 619ce53..18f0774 100644
--- a/modules/nixos/ui/desktops/gnome/default.nix
+++ b/modules/nixos/ui/desktops/gnome/default.nix
@@ -117,6 +117,12 @@ in
 
     # Make sure the keyring is properly unlocked at startup.
     # See https://discourse.nixos.org/t/login-keyring-did-not-get-unlocked-hyprland/40869/8
-    security.pam.services.gdm.enableGnomeKeyring = true;
+    # Also see https://wiki.archlinux.org/title/GNOME/Keyring
+    security.pam.services = {
+      gdm.enableGnomeKeyring = true;
+      passwd.text = lib.mkAfter ''
+        password	optional	pam_gnome_keyring.so
+      '';
+    };
   };
 }