diff --git a/mozilla/layout/html/document/src/forms.css b/mozilla/layout/html/document/src/forms.css
index d7f353cc0cd..5965f463254 100644
--- a/mozilla/layout/html/document/src/forms.css
+++ b/mozilla/layout/html/document/src/forms.css
@@ -402,6 +402,11 @@ input[type="submit"] {
   -moz-binding: none;
 }
 
+button {
+  /* Buttons should lay out like "normal" html, mostly */
+  white-space: normal;  
+}
+
 *|*:-moz-button-content {
   display: block;
   text-align: center;
diff --git a/mozilla/layout/style/forms.css b/mozilla/layout/style/forms.css
index d7f353cc0cd..5965f463254 100644
--- a/mozilla/layout/style/forms.css
+++ b/mozilla/layout/style/forms.css
@@ -402,6 +402,11 @@ input[type="submit"] {
   -moz-binding: none;
 }
 
+button {
+  /* Buttons should lay out like "normal" html, mostly */
+  white-space: normal;  
+}
+
 *|*:-moz-button-content {
   display: block;
   text-align: center;