diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index ee1481dfcf..37492a2ff2 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -3983,7 +3983,7 @@ class PMA_Util
      */
     public static function parseEnumSetValues($definition, $escapeHtml = true)
     {
-        $values_string = htmlentities($definition);
+        $values_string = htmlentities($definition,ENT_COMPAT, "UTF-8");
         // There is a JS port of the below parser in functions.js
         // If you are fixing something here,
         // you need to also update the JS port.
diff --git a/sql.php b/sql.php
index dcbc1a584f..bfa36c5706 100644
--- a/sql.php
+++ b/sql.php
@@ -224,18 +224,22 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
         $field_info_query, null, null, null, PMA_DBI_QUERY_STORE
     );
 
-    $selected_values = explode(',', $_REQUEST['curr_value']);
-
     $values = PMA_Util::parseEnumSetValues($field_info_result[0]['Type']);
 
     $select = '';
-    foreach ($values as $value) {
+       
+	//converts characters of $_REQUEST['curr_value'] to HTML entities 
+    $converted_curr_value=htmlentities($_REQUEST['curr_value'],ENT_COMPAT, "UTF-8");
+	
+	$selected_values = explode (',' , $converted_curr_value);
+    
+    foreach ($values as $value) {       
         $select .= '<option value="' . $value . '"';
-        if (in_array($value, $selected_values, true)) {
-            $select .= ' selected="selected"';
+        if ($value == $converted_curr_value || in_array($value , $selected_values , true)) {
+            $select .= ' selected ';
         }
         $select .= '>' . $value . '</option>';
-    }
+    }  
 
     $select_size = (sizeof($values) > 10) ? 10 : sizeof($values);
     $select = '<select multiple="multiple" size="' . $select_size . '">'