diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 041ec3d254c..73cd3e51de6 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1925,6 +1925,7 @@
           var i;
           for (i = 0; i < this.mTabContainer.childNodes.length; i++) {
             this.mTabContainer.childNodes[i]._tPos = i;
+            this.mTabContainer.childNodes[i].selected = false;
           }
           this.mCurrentTab.selected = true;
           this.mTabContainer.mTabstrip.scrollBoxObject.ensureElementIsVisible(this.mCurrentTab);
@@ -2801,13 +2802,13 @@
     </implementation>
     <handlers>
       <handler event="TabSelect" action="this._handleTabSelect();"/>
-      <handler event="mouseover"><![CDATA[
+      <handler event="mouseover"><![CDATA[
         if (event.originalTarget == this.mAllTabsButton) {
           this.mAllTabsButton
               .setAttribute("tooltiptext",
                             this.mAllTabsButton.getAttribute("tooltipstring"));
-        }
-        else
+        }
+        else
           this.mAllTabsButton.removeAttribute("tooltiptext");
       ]]></handler>
     </handlers>