diff --git a/forms/EditableDropdown.php b/forms/EditableDropdown.php
index 4ab1be87e..3741fd4a7 100755
--- a/forms/EditableDropdown.php
+++ b/forms/EditableDropdown.php
@@ -50,7 +50,7 @@ class EditableDropdown extends EditableFormField {
 			}
 			
 			if(isset($data[$option->ID])) {
-				$option->setField( 'Default', $option->ID == $data['Default'] );
+				$option->setField( 'Default', isset($data['Default']) ? ($option->ID == $data['Default']) : false );
 				$option->populateFromPostData( $data[$option->ID] );
 			} 
 				
diff --git a/forms/EditableDropdownOption.php b/forms/EditableDropdownOption.php
index 2aa4811f6..582f4609a 100755
--- a/forms/EditableDropdownOption.php
+++ b/forms/EditableDropdownOption.php
@@ -75,8 +75,7 @@ class EditableDropdownOption extends DataObject {
 	function DefaultSelect() {
 		$disabled = ($this->readonly) ? " disabled=\"disabled\"" : '';		
 		
-		if( $this->Parent()->getField('Default') == $this->ID )
-			$default = " checked=\"checked\"";
+		$default = ($this->Parent()->getField('Default') == $this->ID) ? " checked=\"checked\"" : "";
 	
 		return "<input class=\"radio\" type=\"radio\" name=\"Fields[{$this->ParentID}][Default]\" value=\"{$this->ID}\"".$disabled.$default." />";
 	}