diff --git a/xpfe/components/history/resources/history-panel.xul b/xpfe/components/history/resources/history-panel.xul
index 81a3cb9bc97e..b430a980a090 100644
--- a/xpfe/components/history/resources/history-panel.xul
+++ b/xpfe/components/history/resources/history-panel.xul
@@ -22,9 +22,10 @@
 -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebarListView.css" type="text/css"?>
+
 <?xul-overlay href="chrome://communicator/content/history/historyTreeOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xml-stylesheet href="chrome://communicator/skin/sidebar/sidebarListView.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/history/history.dtd" >
 
@@ -41,8 +42,7 @@
   </keyset>
   <popupset id="historyContextMenu"/>
   <!-- use deep merging to hide certain columns by default -->
-  <outliner id="historyOutliner" clickcount="1"
-            onclick="if (event.button == 0) OpenURL(event.ctrlKey || event.metaKey);">
+  <outliner id="historyOutliner">
     <outlinercols id="historyOutlinerCols">
       <outlinercol id="Name"/>
       <splitter id="pre-URL-splitter"/>
diff --git a/xpfe/components/history/resources/history.js b/xpfe/components/history/resources/history.js
index c5f739048456..9e45db9ebd16 100644
--- a/xpfe/components/history/resources/history.js
+++ b/xpfe/components/history/resources/history.js
@@ -254,13 +254,8 @@ function collapseExpand()
 
 function OpenURL(aInNewWindow)
 {
-    var currentIndex = gHistoryOutliner.currentIndex;
-    if (isContainer(gHistoryOutliner, currentIndex)) {
-        if (gHistoryOutliner.getAttribute("clickcount") == "1")
-            gHistoryOutliner.outlinerBoxObject.view.toggleOpenState(currentIndex);
-        return false;
-    }
-      
+    var currentIndex = gHistoryOutliner.currentIndex;     
+    var builder = gHistoryOutliner.builder.QueryInterface(Components.interfaces.nsIXULOutlinerBuilder);
     var url = builder.getResourceAtIndex(currentIndex).Value;
 
     if (aInNewWindow) {
diff --git a/xpfe/components/history/resources/history.xul b/xpfe/components/history/resources/history.xul
index f8866798cf1f..1686d2f9387e 100644
--- a/xpfe/components/history/resources/history.xul
+++ b/xpfe/components/history/resources/history.xul
@@ -138,8 +138,7 @@
 </menubar>
 </toolbox>
 
-  <outliner id="historyOutliner"
-            ondblclick="if (event.button == 0) OpenURL(event.ctrlKey || event.metaKey);"/>
+  <outliner id="historyOutliner"/>
   <statusbar id="status-bar" class="chromeclass-status">
     <statusbarpanel id="statusbar-display" flex="1"/>
     <statusbarpanel class="statusbarpanel-iconic" id="offline-status"/>
diff --git a/xpfe/components/history/resources/historyTreeOverlay.xul b/xpfe/components/history/resources/historyTreeOverlay.xul
index 1ee1a929f04c..00836986cdba 100644
--- a/xpfe/components/history/resources/historyTreeOverlay.xul
+++ b/xpfe/components/history/resources/historyTreeOverlay.xul
@@ -78,7 +78,8 @@
             onkeypress="if (event.keyCode == 13) OpenURL(event.ctrlKey || event.metaKey);" 
             onselect="this.outlinerBoxObject.view.selectionChanged();
                       historyOnSelect();"
-            ondraggesture="if (event.originalTarget.localName == 'outlinerchildren') nsDragAndDrop.startDrag(event, historyDNDObserver);">
+            ondraggesture="if (event.originalTarget.localName == 'outlinerchildren') nsDragAndDrop.startDrag(event, historyDNDObserver);"
+            ondblclick="if (validClickConditions(event)) OpenURL(event.ctrlKey || event.metaKey);">
     <template>
       <rule>
         <outlinerchildren>