diff --git a/suite/common/history/history.js b/suite/common/history/history.js
index ed8c325d73b7..7ad91100287d 100644
--- a/suite/common/history/history.js
+++ b/suite/common/history/history.js
@@ -128,18 +128,17 @@ function historyOnClick(aEvent)
     var col = { };
     var elt = { };
     gHistoryTree.treeBoxObject.getCellAt(aEvent.clientX, aEvent.clientY, row, col, elt);
-    if (row.value >= 0 && col.value && elt.value != "twisty" && isContainer(gHistoryTree, row.value))
-      gHistoryTree.treeBoxObject.view.toggleOpenState(row.value);
+    if (row.value >= 0 && col.value) {
+      if (!isContainer(gHistoryTree, row.value))
+        OpenURL(false);
+      else if (elt.value != "twisty")
+        gHistoryTree.treeBoxObject.view.toggleOpenState(row.value);
+    }
   }
 }
 
 function historyOnSelect()
 {
-    if (!gHistoryStatus) {
-      OpenURL(false);
-      return;
-    }
-
     // every time selection changes, save the last hostname
     gLastHostname = "";
     gLastDomain = "";