diff --git a/modules/dev/editors/emacs/default.nix b/modules/dev/editors/emacs/default.nix
index 066c7bac..13c9ff24 100644
--- a/modules/dev/editors/emacs/default.nix
+++ b/modules/dev/editors/emacs/default.nix
@@ -154,6 +154,8 @@ in {
       };
     };
 
+    programs.gnupg.agent = { pinentryPackage = pkgs.pinentry-emacs; };
+
     fonts.packages = with pkgs; [
       (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
       jetbrains-mono