diff --git a/mozilla/suite/common/history/history.js b/mozilla/suite/common/history/history.js
index 3af11f226b4..d65a9d7f8c4 100644
--- a/mozilla/suite/common/history/history.js
+++ b/mozilla/suite/common/history/history.js
@@ -110,7 +110,11 @@ function HistoryCommonInit()
 
     if (gHistoryStatus)
         gHistoryTree.focus();
-    gHistoryTree.view.selection.select(0);
+
+    if (gHistoryTree.view.rowCount > 0)
+        gHistoryTree.view.selection.select(0);
+    else if (gHistoryStatus)
+        updateHistoryCommands();
 }
 
 function HistoryPanelUnload()