diff --git a/content/treestyletab/bookmarksOverlay.js b/content/treestyletab/bookmarksOverlay.js
index f44d7c4e..c3d97ea0 100644
--- a/content/treestyletab/bookmarksOverlay.js
+++ b/content/treestyletab/bookmarksOverlay.js
@@ -79,4 +79,32 @@ window.addEventListener('load', function() {
 		)
 	);
 
+	eval('PlacesCommandHook.bookmarkCurrentPages = '+
+		PlacesCommandHook.bookmarkCurrentPages.toSource().replace(
+			'{',
+			<![CDATA[$&
+				TreeStyleTabService.beginAddBookmarksFromTabs((function() {
+					var tabs = [];
+					var seen = {};
+					Array.slice(getBrowser().mTabContainer.childNodes).forEach(function(aTab) {
+						let uri = aTab.linkedBrowser.currentURI.spec;
+						if (uri in seen) return;
+						seen[uri] = true;
+						tabs.push(aTab);
+					});
+					return tabs;
+				})());
+				try {
+			]]>
+		).replace(
+			/(\}\)?)$/,
+			<![CDATA[
+				}
+				catch(e) {
+				}
+				TreeStyleTabService.endAddBookmarksFromTabs();
+			$1]]>
+		)
+	);
+
 }, false);