diff --git a/forms/OptionsetField.php b/forms/OptionsetField.php
index 83a76c3a6..35ea8649d 100755
--- a/forms/OptionsetField.php
+++ b/forms/OptionsetField.php
@@ -47,7 +47,7 @@ class OptionsetField extends DropdownField {
 			$odd = ($odd + 1) % 2;
 			$extraClass = $odd ? "odd" : "even";
 			$extraClass .= " val" . preg_replace('/[^a-zA-Z0-9\-\_]/','_', $key);
-			$disabled = $this->disabled ? 'disabled="disabled"' : '';
+			$disabled = ($this->disabled || in_array($key, $this->disabledItems)) ? 'disabled="disabled"' : '';
 			
 			$options .= "<li class=\"".$extraClass."\"><input id=\"$itemID\" name=\"$this->name\" type=\"radio\" value=\"$key\"$checked $disabled class=\"radio\" /> <label for=\"$itemID\">$value</label></li>\n";
 		}