diff --git a/mozilla/rdf/content/src/nsXULCheckboxElement.cpp b/mozilla/rdf/content/src/nsXULCheckboxElement.cpp
index 6841be20146..25e583ab6e2 100644
--- a/mozilla/rdf/content/src/nsXULCheckboxElement.cpp
+++ b/mozilla/rdf/content/src/nsXULCheckboxElement.cpp
@@ -148,6 +148,11 @@ nsXULCheckboxElement::GetChecked(PRBool* aChecked)
 NS_IMETHODIMP
 nsXULCheckboxElement::SetChecked(PRBool aChecked)
 {
+  PRBool disabled;
+  GetDisabled(&disabled);
+  if (disabled)
+    return NS_OK;
+
   if(aChecked)
     mOuter->SetAttribute("checked", "true");
   else
diff --git a/mozilla/rdf/content/src/nsXULRadioGroupElement.cpp b/mozilla/rdf/content/src/nsXULRadioGroupElement.cpp
index a866bb76c0a..c9752de84de 100644
--- a/mozilla/rdf/content/src/nsXULRadioGroupElement.cpp
+++ b/mozilla/rdf/content/src/nsXULRadioGroupElement.cpp
@@ -83,6 +83,11 @@ nsXULRadioGroupElement::GetSelectedItem(nsIDOMXULRadioElement** aResult)
 NS_IMETHODIMP
 nsXULRadioGroupElement::SetSelectedItem(nsIDOMXULRadioElement* aItem)
 {
+  PRBool disabled;
+  aItem->GetDisabled(&disabled);
+  if (disabled)
+    return NS_OK;
+
   if (mSelectedItem)
     mSelectedItem->SetChecked(PR_FALSE);
   mSelectedItem = aItem;