diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 00679ecbe..b456ebf6f 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -10125,7 +10125,7 @@ abstract class AttributeSet extends AttributeDBFieldVoid
 
 class AttributeEnumSet extends AttributeSet
 {
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_TAG_SET;
 
 	public static function ListExpectedParams()
 	{
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 39c384395..99e6ded67 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -25,9 +25,9 @@ namespace Combodo\iTop\Application\Search;
 
 use ApplicationContext;
 use AttributeDefinition;
+use AttributeEnumSet;
 use AttributeExternalField;
 use AttributeFriendlyName;
-use AttributeSubItem;
 use AttributeTagSet;
 use CMDBObjectSet;
 use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;
@@ -482,6 +482,16 @@ class SearchForm
 
 			return array('values' => $aAllowedValues);
 		}
+		elseif ($oAttrDef instanceof AttributeEnumSet)
+		{
+			$aAllowedValues = array();
+			foreach($oAttrDef->GetPossibleValues() as $sCode => $sRawValue)
+			{
+				$aAllowedValues[$sCode] = utils::HtmlEntities($sRawValue);
+			}
+
+			return array('values' => $aAllowedValues);
+		}
 		else
 		{
 			if (method_exists($oAttrDef, 'GetAllowedValuesAsObjectSet'))