diff --git a/chrome.manifest b/chrome.manifest
index e9cf9c36..62a64d85 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -4,6 +4,7 @@ overlay	chrome://browser/content/browser.xul	chrome://treestyletab/content/trees
 
 overlay	chrome://browser/content/bookmarks/bookmarksPanel.xul	chrome://treestyletab/content/bookmarksOverlay.xul
 overlay	chrome://browser/content/places/editBookmarkOverlay.xul	chrome://treestyletab/content/editBookmarkOverlay.xul
+overlay	chrome://browser/content/history/history-panel.xul	chrome://treestyletab/content/bookmarksOverlay.xul
 
 overlay	chrome://multipletab/content/config.xul	chrome://treestyletab/content/multipletabConfigOverlay.xul
 
diff --git a/content/treestyletab/bookmarksOverlay.js b/content/treestyletab/bookmarksOverlay.js
index 1aa5e8bb..69b5b2ca 100644
--- a/content/treestyletab/bookmarksOverlay.js
+++ b/content/treestyletab/bookmarksOverlay.js
@@ -126,7 +126,7 @@ var TreeStyleTabBookmarksService = {
 	getItemIdsForContainerNode : function(aNode) 
 	{
 		var ids = [];
-		if (!PlacesUtils.nodeIsContainer(aNode)) return ids;
+		if (!aNode || !PlacesUtils.nodeIsContainer(aNode)) return ids;
 
 		var root = aNode;
 		if ('getContainerNodeWithOptions' in PlacesUtils) { // Firefox 3.5 or later
@@ -155,6 +155,8 @@ var TreeStyleTabBookmarksService = {
 	{
 		window.removeEventListener('load', this, false);
 
+		if (!('PlacesUIUtils' in window)) return;
+
 		eval('PlacesUIUtils._openTabset = '+
 			PlacesUIUtils._openTabset.toSource().replace(
 				/(function[^\(]*\([^\)]+)(\))/,
diff --git a/content/treestyletab/bookmarksOverlay.xul b/content/treestyletab/bookmarksOverlay.xul
index ff5df89a..5696f8b6 100644
--- a/content/treestyletab/bookmarksOverlay.xul
+++ b/content/treestyletab/bookmarksOverlay.xul
@@ -6,6 +6,10 @@
 <script src="treestyletab.js" type="application/x-javascript; version=1.7"/>
 <script src="bookmarksOverlay.js" type="application/x-javascript; version=1.7"/>
 
+<page id="history-panel">
+	<stringbundleset id="placesStringSet"/>
+</page>
+
 <stringbundleset id="placesStringSet">
 	<stringbundle id="treestyletab-stringbundle"
 		src="chrome://treestyletab/locale/treestyletab.properties"/>