diff --git a/code/model/formfields/EditableCheckboxGroupField.php b/code/model/formfields/EditableCheckboxGroupField.php
index da15656..81ac630 100755
--- a/code/model/formfields/EditableCheckboxGroupField.php
+++ b/code/model/formfields/EditableCheckboxGroupField.php
@@ -16,9 +16,9 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField {
 	public function getFormField() {
 		$optionSet = $this->Options();
 		$options = array();
-		
-		$optionMap = ($optionSet) ? $optionSet->map('Title', 'Title') : array();
-		
+
+		$optionMap = ($optionSet) ? $optionSet->map('EscapedTitle', 'Title') : array();
+
 		return new CheckboxSetField($this->Name, $this->Title, $optionMap);
 	}
 	
@@ -40,4 +40,4 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField {
 		}
 		return $result;
 	}
-}
\ No newline at end of file
+}
diff --git a/code/model/formfields/EditableOption.php b/code/model/formfields/EditableOption.php
index 2edf132..8dc5894 100644
--- a/code/model/formfields/EditableOption.php
+++ b/code/model/formfields/EditableOption.php
@@ -70,4 +70,8 @@ class EditableOption extends DataObject {
 		$this->readonly = true;
 		return $this->EditSegment();
 	}
-}
\ No newline at end of file
+
+    public function getEscapedTitle() {
+        return Convert::raw2att($this->Title);
+    }
+}
diff --git a/code/model/formfields/EditableRadioField.php b/code/model/formfields/EditableRadioField.php
index 4ccaa98..e9c951a 100755
--- a/code/model/formfields/EditableRadioField.php
+++ b/code/model/formfields/EditableRadioField.php
@@ -19,7 +19,7 @@ class EditableRadioField extends EditableMultipleOptionField {
 		
 		if($optionSet) {
 			foreach( $optionSet as $option ) {
-				$options[$option->Title] = $option->Title;
+				$options[$option->EscapedTitle] = $option->Title;
 			}	
 		}