diff --git a/scripts/gpg-shell b/scripts/gpg-shell
index 4b1dc76..a8def89 100755
--- a/scripts/gpg-shell
+++ b/scripts/gpg-shell
@@ -6,6 +6,9 @@ export GNUPGHOME=~/.gnupg/trezor
 # Make sure that the device is unlocked before starting the shell
 trezor-gpg-unlock
 
+# Make sure TREZOR-based gpg-agent is running
+gpg-connect-agent --agent-program "$(which trezor-gpg-agent)" </dev/null
+
 COMMAND=$*
 if [ -z "${COMMAND}" ]
 then