diff --git a/modules/nixos/tools/gpg/default.nix b/modules/nixos/tools/gpg/default.nix
index b0312f5..5520609 100644
--- a/modules/nixos/tools/gpg/default.nix
+++ b/modules/nixos/tools/gpg/default.nix
@@ -25,6 +25,11 @@ in {
         };
       };
 
+      programs.ssh.matchBlocks = {
+        # Fix for pinentry showing up in wrong terminal
+        "*".match = "host * exec \"gpg-connect-agent UPDATESTARTUPTTY /bye\"";
+      };
+
       services.gpg-agent = {
         enable = true;
         pinentryFlavor = "curses";