diff --git a/scripts/gpg-shell b/scripts/gpg-shell
index 3dafb94..4b1dc76 100755
--- a/scripts/gpg-shell
+++ b/scripts/gpg-shell
@@ -2,9 +2,15 @@
 set -eu
 
 export GNUPGHOME=~/.gnupg/trezor
-gpg2 --list-public-keys
 
 # Make sure that the device is unlocked before starting the shell
 trezor-gpg-unlock
 
-${SHELL}
+COMMAND=$*
+if [ -z "${COMMAND}" ]
+then
+	gpg2 --list-public-keys
+	${SHELL}
+else
+	${COMMAND}
+fi