diff --git a/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/ContextHelpConnector.java b/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/ContextHelpConnector.java
index e9f41e9..ee32f78 100644
--- a/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/ContextHelpConnector.java
+++ b/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/ContextHelpConnector.java
@@ -1,5 +1,8 @@
 package org.vaadin.jonatan.contexthelp.widgetset.client.ui;
 
+import com.google.gwt.event.dom.client.KeyDownEvent;
+import com.google.gwt.event.dom.client.KeyDownHandler;
+
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.vaadin.client.ServerConnector;
@@ -30,6 +33,17 @@ protected void extend(ServerConnector serverConnector) {
             contextHelp.setHelpKeyCode(getState().helpKey);
             contextHelp.setHideOnBlur(getState().hideOnBlur);
         }
+        if (getState().followFocus) {
+            serverConnector.getWidget().addKeyDownHandler(new KeyDownHandler() {
+                @Override
+                public void onKeyDown(KeyDownEvent event) {
+                    if (event.getKeyCode() == ShortcutAction.KeyCode.F1) {
+                        event.preventDefault();
+                        event.stopPropagation();
+                    }
+                }
+            });
+        }
     }
 
     @Override