diff --git a/mozilla/xpfe/components/history/resources/history.js b/mozilla/xpfe/components/history/resources/history.js
index d6619f997fe..c00b6bedb97 100644
--- a/mozilla/xpfe/components/history/resources/history.js
+++ b/mozilla/xpfe/components/history/resources/history.js
@@ -223,6 +223,12 @@ var historyDNDObserver = {
     }
 };
 
+function validClickConditions(event)
+{
+  return (event.button == 0 &&
+          event.originalTarget.localName == 'outlinerchildren');
+}
+
 function OpenURL(aInNewWindow)
 {
     var currentIndex = gHistoryOutliner.currentIndex;
diff --git a/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul b/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
index 22bb9652368..5eb1a3adcc4 100644
--- a/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
+++ b/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
@@ -78,8 +78,7 @@
             onselect="this.outlinerBoxObject.view.selectionChanged();
                       historyOnSelect();"
             ondraggesture="if (event.originalTarget.localName == 'outlinerchildren') nsDragAndDrop.startDrag(event, historyDNDObserver);"
-            ondblclick="if (event.button == 0 &&
-                            event.originalTarget.localName == 'outlinerchildren') OpenURL(event.ctrlKey || event.metaKey);">
+            ondblclick="if (validClickConditions(event)) OpenURL(event.ctrlKey || event.metaKey);">
     <template>
       <rule>
         <outlinerchildren>