diff --git a/chrome/content/vimperator/events.js b/chrome/content/vimperator/events.js
index 2ef08d23..7b095270 100644
--- a/chrome/content/vimperator/events.js
+++ b/chrome/content/vimperator/events.js
@@ -78,8 +78,11 @@ function Events() //{{{
 
     var active_menubar = false;
 
-    function enterPopupMode()
+    function enterPopupMode(event)
     {
+        if (event.originalTarget.localName == "tooltip")
+            return;
+
         vimperator.addMode(null, vimperator.modes.MENU);
     }
 
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 49f76d2f..eff36273 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -64,7 +64,7 @@ const vimperator = (function() //{{{
     mode_messages[modes.QUICK_HINT]      = "quick";
     mode_messages[modes.EXTENDED_HINT]   = "extended";
     mode_messages[modes.ALWAYS_HINT]     = "always";
-    // mode_messages[modes.MENU]            = "menu"; // TODO: desirable? -> now that it seems to work reliable -> NO (--mst)
+    mode_messages[modes.MENU]            = "menu"; // TODO: desirable? -> now that it seems to work reliable -> NO (--mst)
 
     var mode = modes.NORMAL;
     var extended_mode = modes.NONE;