diff --git a/administrator/components/com_fields/libraries/fieldslistplugin.php b/administrator/components/com_fields/libraries/fieldslistplugin.php
index 92f9cb83dc54e..2074010440035 100644
--- a/administrator/components/com_fields/libraries/fieldslistplugin.php
+++ b/administrator/components/com_fields/libraries/fieldslistplugin.php
@@ -41,8 +41,8 @@ public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form
 
 		foreach ($this->getOptionsFromField($field) as $value => $name)
 		{
-			$option = new DOMElement('option', htmlentities($value));
-			$option->nodeValue = htmlentities(JText::_($name));
+			$option = new DOMElement('option', htmlspecialchars($value, ENT_COMPAT, 'UTF-8'));
+			$option->nodeValue = htmlspecialchars(JText::_($name), ENT_COMPAT, 'UTF-8');
 
 			$element = $fieldNode->appendChild($option);
 			$element->setAttribute('value', $value);