diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index a6d25750af65..b940df7f8230 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -62,10 +62,6 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-m
   min-width: 1px;
 }
 
-#FindToolbar {
-  overflow-x: hidden;
-}
-
 /* Identity UI */
 #identity-popup-content-box.unknownIdentity > #identity-popup-connectedToLabel ,
 #identity-popup-content-box.unknownIdentity > #identity-popup-runByLabel ,
diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml
index b320bdd8b25c..31aea58bfce9 100644
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -209,7 +209,8 @@
       <stylesheet src="chrome://global/skin/findBar.css"/>
     </resources>
 
-    <content align="center" hidden="true">
+    <content hidden="true">
+    <xul:hbox class="findbar-container" flex="1" align="center">
       <xul:toolbarbutton anonid="find-closebutton"
                          class="findbar-closebutton"
                          tooltiptext="&findCloseButton.tooltip;"
@@ -259,6 +260,7 @@
                        control="findbar-textbox">
       <!-- Do not use value, first child is used because it provides a11y with text change events -->
       </xul:description>
+    </xul:hbox>
     </content>
 
     <implementation implements="nsIDOMEventListener">
diff --git a/toolkit/themes/gnomestripe/global/findBar.css b/toolkit/themes/gnomestripe/global/findBar.css
index b4e2f09c2a02..3d426c72965b 100644
--- a/toolkit/themes/gnomestripe/global/findBar.css
+++ b/toolkit/themes/gnomestripe/global/findBar.css
@@ -98,7 +98,7 @@ findbar {
   color: #FFFFFF;
 }
 
-findbar[flash="true"]  > .find-field-container > .findbar-textbox {
+findbar[flash="true"] > .findbar-container > .find-field-container > .findbar-textbox {
   background-color: yellow;
 }
 
diff --git a/toolkit/themes/pinstripe/global/findBar.css b/toolkit/themes/pinstripe/global/findBar.css
index df262d5e8761..b1dd932090d6 100644
--- a/toolkit/themes/pinstripe/global/findBar.css
+++ b/toolkit/themes/pinstripe/global/findBar.css
@@ -9,8 +9,8 @@ findbar {
   min-width: 1px;
 }
 
-findbar > label,
-findbar > description {
+.findbar-container > label,
+.findbar-container > description {
   font-weight: bold;
 }
 
@@ -30,8 +30,8 @@ findbar > description {
   list-style-image: url("chrome://global/skin/icons/closetab-active.png") !important;
 }
 
-findbar > toolbarbutton,
-findbar > hbox > toolbarbutton {
+.findbar-container > toolbarbutton,
+.findbar-container > hbox > toolbarbutton {
   -moz-appearance: none;
   border: 1px solid #5F5F5F;
   -moz-border-radius: 10px;
@@ -40,51 +40,51 @@ findbar > hbox > toolbarbutton {
   padding: 0 3px;
 }
 
-findbar > toolbarbutton > .toolbarbutton-text,
-findbar > hbox > toolbarbutton > .toolbarbutton-text {
+.findbar-container > toolbarbutton > .toolbarbutton-text,
+.findbar-container > hbox > toolbarbutton > .toolbarbutton-text {
   margin: 1px 6px !important;
 }
 
-findbar > toolbarbutton[disabled],
-findbar > hbox > toolbarbutton[disabled] {
+.findbar-container > toolbarbutton[disabled],
+.findbar-container > hbox > toolbarbutton[disabled] {
   border-color: #8F8F8F !important;
   color: graytext;
 }
 
-findbar > toolbarbutton:not([disabled]):hover:active,
-findbar > hbox > toolbarbutton:not([disabled]):hover:active {
+.findbar-container > toolbarbutton:not([disabled]):hover:active,
+.findbar-container > hbox > toolbarbutton:not([disabled]):hover:active {
   background-image: url("chrome://global/skin/icons/white-gray-gradient-active.gif");
 }
 
 
-findbar > .findbar-closebutton > .toolbarbutton-text {
+.findbar-container > .findbar-closebutton > .toolbarbutton-text {
   display: none;  
 }
 
-findbar > checkbox {
+.findbar-container > checkbox {
    list-style-image: url("chrome://global/skin/icons/checkbox.png");
    -moz-image-region: rect(0px 16px 16px 0px);
    -moz-appearance: none;
    -moz-margin-start: 7px;
 }
 
-findbar > checkbox:hover:active {
+.findbar-container > checkbox:hover:active {
    -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-findbar > checkbox[checked] {
+.findbar-container > checkbox[checked] {
    -moz-image-region: rect(0px 48px 16px 32px);
 }
 
-findbar > checkbox[checked]:hover:active {
+.findbar-container > checkbox[checked]:hover:active {
    -moz-image-region: rect(0px 64px 16px 48px);
 }
 
-findbar > checkbox > .checkbox-check {
+.findbar-container > checkbox > .checkbox-check {
   display: none; 
 }
 
-findbar > checkbox > .checkbox-label-box > .checkbox-label {
+.findbar-container > checkbox > .checkbox-label-box > .checkbox-label {
   margin: 1px 0 !important;
 }
 
@@ -109,7 +109,7 @@ findbar > checkbox > .checkbox-label-box > .checkbox-label {
   -moz-outline-radius: 11px;
 }
 
-findbar[flash="true"] > .find-field-container > .findbar-textbox {
+findbar[flash="true"] > .findbar-container > .find-field-container > .findbar-textbox {
   -moz-border-top-colors: #5F5F5F #F7E379 #F7E379;
   -moz-border-bottom-colors: #9F9F9F #F7E379 #F7E379;
   -moz-border-right-colors: #7F7F7F #F7E379 #F7E379;
diff --git a/toolkit/themes/winstripe/global/findBar.css b/toolkit/themes/winstripe/global/findBar.css
index e0818c091504..accd715b09f0 100755
--- a/toolkit/themes/winstripe/global/findBar.css
+++ b/toolkit/themes/winstripe/global/findBar.css
@@ -118,7 +118,7 @@ findbar {
   color: #FFFFFF;
 }
 
-findbar[flash="true"]  > .find-field-container > .findbar-textbox {
+findbar[flash="true"] > .findbar-container > .find-field-container > .findbar-textbox {
   background-color: yellow;
 }