diff --git a/toolkit/content/widgets/button.xml b/toolkit/content/widgets/button.xml
index 9157c9a2ae2..16f20277295 100644
--- a/toolkit/content/widgets/button.xml
+++ b/toolkit/content/widgets/button.xml
@@ -114,20 +114,31 @@
         ]]>
         </body>
       </method>
+
+      <method name="_handleClick">
+        <body>
+        <![CDATA[
+          if (!this.disabled &&
+              (this.autoCheck || !this.hasAttribute("autoCheck"))) {
+
+            if (this.type == "checkbox") {
+              this.checked = !this.checked;
+            } else if (this.type == "radio") {
+              this.checked = true;
+            }
+          }
+        ]]>
+        </body>
+      </method>
     </implementation>
 
     <handlers>
-      <handler event="command">
-      <![CDATA[
-        if (this.autoCheck || !this.hasAttribute("autoCheck")) {
-          if (this.type == "checkbox") {
-            this.checked = !this.checked;
-          } else if (this.type == "radio") {
-            this.checked = true;
-          }
-        }
-      ]]>
-      </handler>
+      <!-- While it would seem we could do this by handling oncommand, we can't
+           because any external oncommand handlers might get called before ours,
+           and then they would see the incorrect value of checked. Additionally
+           a command attribute would redirect the command events anyway.-->
+      <handler event="click" button="0" action="this._handleClick();"/>
+      <handler event="keypress" key=" " action="this._handleClick();"/>
 
       <handler event="keypress">
       <![CDATA[
@@ -211,8 +222,11 @@
       <xul:hbox class="box-inherit button-box" xbl:inherits="align,dir,pack,orient"
                 align="center" pack="center" flex="1">
         <children>
-          <xul:image class="button-icon" xbl:inherits="src=image"/>
-          <xul:label class="button-text" xbl:inherits="value=label,accesskey,crop" flex="1"/>
+          <xul:hbox class="box-inherit" xbl:inherits="align,dir,pack,orient"
+                    align="center" pack="center" flex="1">
+            <xul:image class="button-icon" xbl:inherits="src=image"/>
+            <xul:label class="button-text" xbl:inherits="value=label,accesskey,crop"/>
+          </xul:hbox>
           <xul:dropmarker class="button-menu-dropmarker" xbl:inherits="open,disabled,label"/>
         </children>
       </xul:hbox>
