diff --git a/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/VContextHelp.java b/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/VContextHelp.java
index 7424472..22f78ec 100644
--- a/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/VContextHelp.java
+++ b/addon/src/main/java/org/vaadin/jonatan/contexthelp/widgetset/client/ui/VContextHelp.java
@@ -151,12 +151,16 @@ private boolean shouldHideBubble() {
     }
 
     private void openBubble() {
-        scrollUpdater.cancel();
-        scrollUpdater.scheduleRepeating(SCROLL_UPDATER_INTERVAL);
+        restartScrollUpdater();
         setHidden(false);
         fireBubbleMovedEvent(getHelpElement().getId());
     }
 
+    private void restartScrollUpdater() {
+        scrollUpdater.cancel();
+        scrollUpdater.scheduleRepeating(SCROLL_UPDATER_INTERVAL);
+    }
+
     private void closeBubble() {
         scrollUpdater.cancel();
         setHidden(true);
@@ -165,6 +169,7 @@ private void closeBubble() {
 
     public void showHelpBubble(String componentId, String helpText, Placement placement) {
         bubble.showHelpBubble(componentId, helpText, placement);
+        restartScrollUpdater();
     }
 
     public void hideHelpBubble() {