diff --git a/ChangeLog b/ChangeLog
index 78ee643336..85781a0d36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ phpMyAdmin - ChangeLog
 - issue #14633 Use Sass instead of PHP to compile CSS
 - issue #14053 Fix missed padding on query results
 - issue #14765 Add initial support for Bootstrap 4
+- issue #14829 Change table column comment field from input to textarea
 
 4.8.5 (not yet released)
 - issue        Developer debug data was saved to the PHP error log
diff --git a/templates/columns_definitions/column_comment.twig b/templates/columns_definitions/column_comment.twig
index 951958a0eb..653441bf93 100644
--- a/templates/columns_definitions/column_comment.twig
+++ b/templates/columns_definitions/column_comment.twig
@@ -1,5 +1,6 @@
 <textarea id="field_{{ column_number }}_{{ ci - ci_offset }}"
     rows="1"
     name="field_comments[{{ column_number }}]"
-    maxlength="{{ max_length }}">{{ value|raw }}
+    maxlength="{{ max_length }}">
+  {{- value|raw -}}
 </textarea>