diff --git a/mozilla/themes/classic/global/mac/listbox.css b/mozilla/themes/classic/global/mac/listbox.css
index 69f418bceeb..14eafc152ac 100644
--- a/mozilla/themes/classic/global/mac/listbox.css
+++ b/mozilla/themes/classic/global/mac/listbox.css
@@ -56,6 +56,10 @@ listbox {
   color: -moz-FieldText;
 }
 
+listbox[disabled="true"] {
+  color: GrayText;
+}
+
 .listcell-label {
   margin: 0px !important;
   padding: 0px 0px 1px 4px;
@@ -170,4 +174,4 @@ listheader[sortable="true"]:hover:active {
 
 .listcell-check[disabled="true"][checked="true"] {
   background-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
-}
\ No newline at end of file
+}
diff --git a/mozilla/themes/classic/global/win/listbox.css b/mozilla/themes/classic/global/win/listbox.css
index df54ad441c0..fb2b5ccd8ae 100644
--- a/mozilla/themes/classic/global/win/listbox.css
+++ b/mozilla/themes/classic/global/win/listbox.css
@@ -57,6 +57,10 @@ listbox {
   -moz-appearance: listbox;
 }
 
+listbox[disabled="true"] {
+  color: GrayText;
+}
+
 /* ::::: listitem ::::: */
 
 listitem {
diff --git a/mozilla/themes/modern/global/listbox.css b/mozilla/themes/modern/global/listbox.css
index 17dfe82a7b7..49318fb802e 100644
--- a/mozilla/themes/modern/global/listbox.css
+++ b/mozilla/themes/modern/global/listbox.css
@@ -56,6 +56,10 @@ listbox {
   color: #000000;
 }
 
+listbox[disabled="true"] {
+  color: #999999;
+}
+
 /* ::::: listitem ::::: */
 
 listitem {
diff --git a/mozilla/xpfe/global/resources/content/bindings/listbox.xml b/mozilla/xpfe/global/resources/content/bindings/listbox.xml
index d5ed5d04147..9df6a7cd6b6 100644
--- a/mozilla/xpfe/global/resources/content/bindings/listbox.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/listbox.xml
@@ -59,6 +59,11 @@
       
       <!-- ///////////////// public listbox members ///////////////// -->
 
+      <property name="disabled" onset="if (val) this.setAttribute('disabled', 'true');
+                                       else this.removeAttribute('disabled');
+                                       return val;"
+                                onget="return this.hasAttribute('disabled');"/>
+
       <property name="listBoxObject"
                 onget="return this.boxObject.QueryInterface(Components.interfaces.nsIListBoxObject);"
                 readonly="true"/>
@@ -800,6 +805,7 @@
            click, so that drags work correctly. -->
       <handler event="mousedown">
       <![CDATA[
+        if (this.parentNode.disabled) return;
         if (!event.ctrlKey && !event.shiftKey && !event.metaKey) {
           if (!this.selected) {
             parentNode.selectItem(this);
@@ -811,9 +817,9 @@
 
       <!-- On a click (up+down on the same item), deselect everything
            except this item. -->
-      <handler event="click">
+      <handler event="click" button="0">
       <![CDATA[
-        if (event.button != 0) return;
+        if (this.parentNode.disabled) return;
         if (parentNode.selType != "multiple") {
           parentNode.selectItem(this);
         }
@@ -889,7 +895,12 @@
     </implementation>
 
     <handlers> 
-      <handler event="mousedown" button="0" action="if (!this.disabled) this.checked = !this.checked;"/>
+      <handler event="mousedown" button="0">
+      <![CDATA[
+        if (!this.disabled && !this.parentNode.disabled)
+          this.checked = !this.checked;
+      ]]>
+      </handler>
     </handlers>
   </binding>