diff --git a/toolkit/content/widgets/tabbox.xml b/toolkit/content/widgets/tabbox.xml
index 2c07accf91f..a53f5d73025 100644
--- a/toolkit/content/widgets/tabbox.xml
+++ b/toolkit/content/widgets/tabbox.xml
@@ -477,7 +477,7 @@
             aNewTab.focus();
           }
           else if (this.getAttribute("setfocus") != "false") {
-            document.commandDispatcher.advanceFocusIntoSubtree(aNewTab);
+            document.commandDispatcher.advanceFocusIntoSubtree(this.tabbox.selectedPanel);
             
             // Make sure that the focus doesn't move outside the tabbox
             if (this.tabbox) {