diff --git a/gpg-agent.conf b/gpg-agent.conf
index 85405bc1..c375a285 100644
--- a/gpg-agent.conf
+++ b/gpg-agent.conf
@@ -1 +1,6 @@
 enable-ssh-support
+
+## Tell the pinentry not to grab the keyboard and mouse.
+## This option should in general not be used to avoid X-sniffing attacks.
+# This is the behaviour which I want, the default is annoying.
+no-grab