diff --git a/hm/gpg/default.nix b/hm/gpg/default.nix
index e299d01..612aebe 100644
--- a/hm/gpg/default.nix
+++ b/hm/gpg/default.nix
@@ -34,6 +34,10 @@
     services.gpg-agent = {
       enableBashIntegration = true;
       enableZshIntegration = true;
+      pinentryFlavor = "gnome3";
+      # gnome3 is nicer, but requires gcr as a dbus package.
+      # Which is in my NixOS config, and on non-NixOS too.
+      # It will fall back to ncurses when running in non-graphics mode.
     };
   };
 }
diff --git a/os/desktop.nix b/os/desktop.nix
index d836976..2708944 100644
--- a/os/desktop.nix
+++ b/os/desktop.nix
@@ -41,5 +41,8 @@
         pulseaudio.enable = true;
         # TODO Try pipewire
     };
+
+    # So we can use gnome3 pinentry flavour
+    services.dbus.packages = [ pkgs.gcr ];
   };
 }