diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index fd7417cb6cae..454acc04bee9 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -565,8 +565,14 @@ function updateGoMenu(goMenu)
   destroyGoMenuItems(goMenu);
 
   var history = document.getElementById("hiddenHistoryTree");
-  if (history.hidden)
+  
+  if (history.hidden) {
     history.hidden = false;
+    var globalHistory = Components.classes["@mozilla.org/browser/global-history;1"]
+                                  .getService(Components.interfaces.nsIGlobalHistory);
+    var dataSource = globalHistory.QueryInterface(Components.interfaces.nsIRDFDataSource);
+    history.database.AddDataSource(dataSource);
+  }
 
   if (!history.ref)
     history.ref = "NC:HistoryRoot";
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index c4560824fabf..02a5c0c66648 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -430,8 +430,8 @@ Contributor(s):
   </popup>
 
   <!-- Total hack. Used by the Go menu to build up items. -->
-  <tree id="hiddenHistoryTree" hidden="true" collapsed="true"
-                  datasources="rdf:history" flags="dont-build-content"
+  <tree id="hiddenHistoryTree" hidden="true" collapsed="true" datasources="rdf:null"
+                  flags="dont-build-content"
                   hidecolumnpicker="true">
     <template>
       <rule>
diff --git a/browser/components/bookmarks/content/bookmarksToolbar.xml b/browser/components/bookmarks/content/bookmarksToolbar.xml
index 7401633cdbbc..c824375e0658 100644
--- a/browser/components/bookmarks/content/bookmarksToolbar.xml
+++ b/browser/components/bookmarks/content/bookmarksToolbar.xml
@@ -65,6 +65,7 @@
           var menu = buttons.nextSibling.childNodes[1];
           var width = window.innerWidth;
           menu.collapsed = true;
+          var overflowed = false;
 
           for (var i=4; i<buttons.childNodes.length; i++) {
             var button = buttons.childNodes[i];