diff --git a/ChangeLog b/ChangeLog
index 971b9b5f7..b52b07260 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Turkish update, thanks to Burak Yavuz
 + [auth] Add custom port configuration in signon, thanks to Gary Smith
 - [core] Removed context from the error handler 
+- [interface] #2879909 Removed double htmlspecialchars when editing enum column
 
 3.2.3.0 (not yet released)
 - patch #2856664 [export] Date, time, and datetime column types now export correctly to
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 10777a81d..3e3a5fe3f 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -349,13 +349,12 @@ for ($i = 0; $i < $num_fields; $i++) {
         $binary           = 0;
         $unsigned         = 0;
         $zerofill         = 0;
-        $length_to_display = htmlspecialchars($length);
     } else {
-        $length_to_display = $length;
         $binary           = false;
         $unsigned         = stristr($row['Type'], 'unsigned');
         $zerofill         = stristr($row['Type'], 'zerofill');
     }
+    $length_to_display = $length;
 
     $content_cells[$i][$ci] = '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '"'
         . ' type="text" name="field_length[' . $i . ']" size="' . $length_values_input_size . '"'