diff --git a/content/treestyletab/hacks.js b/content/treestyletab/hacks.js
index 912e647b..3a76ffa5 100644
--- a/content/treestyletab/hacks.js
+++ b/content/treestyletab/hacks.js
@@ -258,11 +258,32 @@ TreeStyleTabService.overrideExtensions = function() {
 
 		eval('TMP_Bookmark.openGroup = '+
 			TMP_Bookmark.openGroup.toSource().replace(
-				/(tabToSelect = aTab;)/,
-				'$1 TreeStyleTabService.readyToOpenChildTab(tabToSelect, true);'
+				/(var tabToSelect = null;)/,
+				<><![CDATA[
+					$1
+					browser.__treestyletab__internallyTabMoving = true;
+				]]></>
+			).replace(
+				'index = prevTab._tPos + 1;',
+				<><![CDATA[
+					index = TreeStyleTabService.getNextSiblingTab(TreeStyleTabService.getRootTab(prevTab));
+					if (tabToSelect == aTab) index = TreeStyleTabService.getNextSiblingTab(index);
+					index = index ? index._tPos : (prevTab._tPos + 1);
+				]]></>
+			).replace(
+				/(prevTab = aTab;)/,
+				<><![CDATA[
+					$1
+					if (tabToSelect == aTab) {
+						TreeStyleTabService.readyToOpenChildTab(tabToSelect, true, TreeStyleTabService.getNextSiblingTab(tabToSelect));
+					}
+				]]></>
 			).replace(
 				/(browser.mTabContainer.nextTab)/,
-				'TreeStyleTabService.stopToOpenChildTab(tabToSelect); $1'
+				<><![CDATA[
+					TreeStyleTabService.stopToOpenChildTab(tabToSelect);
+					browser.__treestyletab__internallyTabMoving = false;
+					$1]]></>
 			)
 		);
 
diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index 739531b1..885c0865 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -1854,6 +1854,17 @@ catch(e) {
 			).singleNodeValue;
 	},
  
+	getRootTab : function(aTab) 
+	{
+		var parent = aTab;
+		var root   = aTab;
+		while (parent = this.getParentTab(parent))
+		{
+			root = parent;
+		}
+		return root;
+	},
+ 
 	getNextSiblingTab : function(aTab) 
 	{
 		if (!aTab) return null;