diff --git a/content/treestyletab/windowHelper.js b/content/treestyletab/windowHelper.js
index 89128eeb..b7c66bc6 100644
--- a/content/treestyletab/windowHelper.js
+++ b/content/treestyletab/windowHelper.js
@@ -263,46 +263,13 @@ var TreeStyleTabWindowHelper = {
 			}
 		}
 
-		let (functions = this._splitFunctionNames(<![CDATA[
-				window.duplicateTab.gotoHistoryIndex
-				window.duplicateTab.BrowserBack
-				window.duplicateTab.BrowserForward
-				window.duplicatethistab.gotoHistoryIndex
-				window.duplicatethistab.BrowserBack
-				window.duplicatethistab.BrowserForward
-				window.__rewindforward__BrowserForward
-				window.__rewindforward__BrowserBack
-				window.gotoHistoryIndex
-				window.BrowserForward
-				window.BrowserBack
-			]]>)) {
-			for (let i = 0, maxi = functions.length; i < maxi; i++)
-			{
-				let func = functions[i];
-				let source = this._getFunctionSource(func);
-				if (!source || !/^\(?function (gotoHistoryIndex|BrowserForward|BrowserBack)/.test(source))
-					continue;
-				eval(func+' = '+source.replace(
-					/((?:openUILinkIn|duplicateTabIn)\()/g,
-					'TreeStyleTabService.onBeforeOpenLink(where); $1'
-				));
-			}
-		}
-
-		let (functions = this._splitFunctionNames(<![CDATA[
-				window.BrowserReloadOrDuplicate
-			]]>)) {
-			for (let i = 0, maxi = functions.length; i < maxi; i++)
-			{
-				let func = functions[i];
-				let source = this._getFunctionSource(func);
-				if (!source || !/^\(?function (BrowserReloadOrDuplicate)/.test(source))
-					continue;
-				eval(func+' = '+source.replace(
-					/((?:openUILinkIn|duplicateTabIn)\([^\)]+\))/g,
-					'(TreeStyleTabService.onBeforeTabReloadOrDuplicate(where), $&)'
-				));
-			}
+		if (window.duplicateTabIn) {
+			eval('window.duplicateTabIn = '+
+				window.duplicateTabIn.toSource().replace(
+					'{',
+					'{ gBrowser.treeStyleTab.onBeforeTabDuplicate(aTab, where); '
+				)
+			);
 		}
 
 		let (functions = this._splitFunctionNames(<![CDATA[
diff --git a/modules/window.js b/modules/window.js
index 93b068a7..437e3278 100644
--- a/modules/window.js
+++ b/modules/window.js
@@ -1165,18 +1165,15 @@ TreeStyleTabWindow.prototype = {
 	},
 	_clickEventOnNewTabButtonHandled : false,
  
-	onBeforeTabDuplicate : function TSTWindow_onBeforeTabDuplicate(aTab) 
+	onBeforeTabDuplicate : function TSTWindow_onBeforeTabDuplicate(aTab, aWhere) 
 	{
+		if (aWhere && aWhere.indexOf('tab') != 0)
+			return;
+
 		var b = this.getTabBrowserFromChild(aTab) || this.browser;
 		this._handleNewTabCommand(aTab || b.selectedTab, this.getTreePref('autoAttach.duplicateTabCommand'));
 	},
  
-	onBeforeTabReloadOrDuplicate : function TSTWindow_onBeforeTabReloadOrDuplicate(aWhere) 
-	{
-		if (aWhere == 'tab' || aWhere == 'tabshifted')
-			this.onBeforeTabDuplicate(null);
-	},
- 
 	onBeforeOpenLink : function TSTWindow_onBeforeOpenLink(aWhere, aOwner) 
 	{
 		if (aWhere == 'tab' || aWhere == 'tabshifted')