--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -425,34 +425,34 @@
               style="&dialog.style;"
               hidden="true"/>
     </panel>
 
     <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
   </popupset>
 
 #ifdef CAN_DRAW_IN_TITLEBAR
-  <vbox id="titlebar">
+<vbox id="titlebar">
   <hbox id="titlebar-content">
-  <hbox id="appmenu-button-container" align="start">
-  <button id="appmenu-button"
-          type="menu"
-          label="&brandShortName;"
-          style="-moz-user-focus: ignore;">
+    <hbox id="appmenu-button-container" align="start">
+      <button id="appmenu-button"
+              type="menu"
+              label="&brandShortName;"
+              style="-moz-user-focus: ignore;">
 #include browser-appmenu.inc
-  </button>
+      </button>
+    </hbox>
+    <spacer id="titlebar-spacer" flex="1"/>
+    <hbox id="titlebar-buttonbox">
+      <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
+      <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
+      <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
+    </hbox>
   </hbox>
-  <spacer id="titlebar-spacer" flex="1"/>
-  <hbox id="titlebar-buttonbox">
-    <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
-    <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
-    <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
-  </hbox>
-  </hbox>
-  </vbox>
+</vbox>
 #endif
 
 <deck flex="1" id="tab-view-deck">
 <vbox flex="1">
 
   <toolbox id="navigator-toolbox"
            defaultmode="icons" mode="icons"
 #ifdef WINCE