diff --git a/content/treestyletab/hacks.js b/content/treestyletab/hacks.js
index 1687a9a2..44d7683b 100644
--- a/content/treestyletab/hacks.js
+++ b/content/treestyletab/hacks.js
@@ -313,7 +313,7 @@ TreeStyleTabWindowHelper.overrideExtensionsPreInit = function TSTWH_overrideExte
 	}
 };
 
-TreeStyleTabWindowHelper.overrideExtensionsOnInitBefore = function TSTWH_overrideExtensionsOnInitBefore() {
+TreeStyleTabWindowHelper.overrideExtensionsBeforeBrowserInit = function TSTWH_overrideExtensionsBeforeBrowserInit() {
 	var sv = this.service;
 
 	// Tab Mix Plus
@@ -396,6 +396,10 @@ TreeStyleTabWindowHelper.overrideExtensionsOnInitBefore = function TSTWH_overrid
 			);
 		}
 	}
+};
+
+TreeStyleTabWindowHelper.overrideExtensionsAfterBrowserInit = function TSTWH_overrideExtensionsAfterBrowserInit() {
+	var sv = this.service;
 
 	// Selection Links
 	// https://addons.mozilla.org/firefox/addon/8644
diff --git a/content/treestyletab/windowHelper.js b/content/treestyletab/windowHelper.js
index 381a97e6..28e92c31 100644
--- a/content/treestyletab/windowHelper.js
+++ b/content/treestyletab/windowHelper.js
@@ -59,11 +59,16 @@ var TreeStyleTabWindowHelper = {
 		this.overrideExtensionsPreInit(); // hacks.js
 	},
  
-	init : function TSTWH_init() 
+	onBeforeBrowserInit : function TSTWH_onBeforeBrowserInit() 
 	{
-		this.overrideExtensionsOnInitBefore(); // hacks.js
+		this.overrideExtensionsBeforeBrowserInit(); // hacks.js
 		this.overrideGlobalFunctions();
 	},
+ 
+	onAfterBrowserInit : function TSTWH_onAfterBrowserInit() 
+	{
+		this.overrideExtensionsAfterBrowserInit(); // hacks.js
+	},
 	
 	updateTabDNDObserver : function TSTWH_updateTabDNDObserver(aObserver) 
 	{
diff --git a/modules/window.js b/modules/window.js
index 04fc47d3..faa1ae42 100644
--- a/modules/window.js
+++ b/modules/window.js
@@ -407,8 +407,9 @@ TreeStyleTabWindow.prototype = {
 
 		this.initUninstallationListener();
 
-		w.TreeStyleTabWindowHelper.init();
+		w.TreeStyleTabWindowHelper.onBeforeBrowserInit();
 		this.initTabBrowser(this.browser);
+		w.TreeStyleTabWindowHelper.onAfterBrowserInit();
 
 		this.processRestoredTabs();
 		this.updateTabsOnTop();