diff --git a/layout/html/document/src/forms.css b/layout/html/document/src/forms.css
index 8a8e34f465f..82717f2a657 100644
--- a/layout/html/document/src/forms.css
+++ b/layout/html/document/src/forms.css
@@ -227,9 +227,15 @@ optgroup[disabled],
 select[disabled],
 select[disabled]:-moz-display-comboboxcontrol-frame {
   color: GrayText;
+  background-color: ThreeDFace;
   cursor: default;
 }
 
+option[disabled],
+optgroup[disabled] {
+  background-color: -moz-field;
+}
+
 /* hidden inputs */
 input[type="hidden"] {
   display: none;
@@ -324,7 +330,6 @@ input[type="checkbox"][disabled]:hover,
 input[type="checkbox"][disabled]:hover:active {
   padding: 1px;
   border-color: ThreeDShadow;
-  background-color: GrayText;
 
   border-width: 1px !important;
   border-style: inset !important;
diff --git a/layout/style/forms.css b/layout/style/forms.css
index 8a8e34f465f..82717f2a657 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -227,9 +227,15 @@ optgroup[disabled],
 select[disabled],
 select[disabled]:-moz-display-comboboxcontrol-frame {
   color: GrayText;
+  background-color: ThreeDFace;
   cursor: default;
 }
 
+option[disabled],
+optgroup[disabled] {
+  background-color: -moz-field;
+}
+
 /* hidden inputs */
 input[type="hidden"] {
   display: none;
@@ -324,7 +330,6 @@ input[type="checkbox"][disabled]:hover,
 input[type="checkbox"][disabled]:hover:active {
   padding: 1px;
   border-color: ThreeDShadow;
-  background-color: GrayText;
 
   border-width: 1px !important;
   border-style: inset !important;