diff --git a/mozilla/browser/base/content/browser-menubar.inc b/mozilla/browser/base/content/browser-menubar.inc
index 84137c3b4fa..ae94c03bcfa 100644
--- a/mozilla/browser/base/content/browser-menubar.inc
+++ b/mozilla/browser/base/content/browser-menubar.inc
@@ -374,7 +374,7 @@
                   oncommand="var url = event.target.getAttribute('statustext'); if (url) openUILink(url, event, false, true);"
                   onclick="checkForMiddleClick(this, event);">
 
-              <menupopup id="goPopup" onpopupshowing="updateGoMenu(this);" onpopuphiding="onGoMenuHidden();">
+              <menupopup id="goPopup" onpopupshowing="updateGoMenu(event, this);" onpopuphiding="onGoMenuHidden(event);">
                 <menuitem label="&backCmd.label;"
 #ifdef XP_MACOSX
                           key="goBackKb2"
diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 2ef30fd7537..4c30a3573d0 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -1653,9 +1653,10 @@ function constructGoMenuItem(goMenu, beforeItem, url, title)
   return menuitem;
 }
 
-function onGoMenuHidden()
+function onGoMenuHidden(aEvent)
 {
-  setTimeout(destroyGoMenuItems, 0, document.getElementById('goPopup'));
+  if (aEvent.target == aEvent.currentTarget)
+    setTimeout(destroyGoMenuItems, 0, document.getElementById('goPopup'));
 }
 
 function destroyGoMenuItems(goMenu) {
@@ -1680,8 +1681,11 @@ function destroyGoMenuItems(goMenu) {
   }
 }
 
-function updateGoMenu(goMenu)
+function updateGoMenu(aEvent, goMenu)
 {
+  if (aEvent.target != aEvent.currentTarget)
+    return;
+
   // In case the timer didn't fire.
   destroyGoMenuItems(goMenu);