diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 62a5f068b6..1e81b5ea61 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -821,6 +821,8 @@ function PMA_getTextarea($column, $backup_field, $column_name_appendix,
         $the_class = 'char';
         $textAreaRows = $GLOBALS['cfg']['CharTextareaRows'];
         $textareaCols = $GLOBALS['cfg']['CharTextareaCols'];
+        $extracted_columnspec = PMA_Util::extractColumnSpec($column['Type']);
+        $maxlength = $extracted_columnspec['spec_in_brackets'];
     } elseif ($GLOBALS['cfg']['LongtextDoubleTextarea']
         && strstr($column['pma_type'], 'longtext')
     ) {
@@ -830,6 +832,7 @@ function PMA_getTextarea($column, $backup_field, $column_name_appendix,
     $html_output = $backup_field . "\n"
         . '<textarea name="fields' . $column_name_appendix . '"'
         . ' class="' . $the_class . '"'
+        . (isset($maxlength) ? ' maxlength="' . $maxlength . '"' : '')
         . ' rows="' . $textAreaRows . '"'
         . ' cols="' . $textareaCols . '"'
         . ' dir="' . $text_dir . '"'
@@ -1198,6 +1201,7 @@ function PMA_getHTMLinput($column, $column_name_appendix, $special_chars,
     return '<input type="' . $input_type . '"'
         . ' name="fields' . $column_name_appendix . '"'
         . ' value="' . $special_chars . '" size="' . $fieldsize . '"'
+        . ((isset($column['is_char']) && $column['is_char']) ? ' maxlength="' . $fieldsize . '"' : '')
         . ($input_min_max !== false ? ' ' . $input_min_max : '')
         . ($input_type === 'time' ? ' step="1"' : '')
         . ' class="' . $the_class . '" ' . $unnullify_trigger
diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php
index 66259461b6..d43dc5ee51 100644
--- a/test/libraries/PMA_insert_edit_test.php
+++ b/test/libraries/PMA_insert_edit_test.php
@@ -813,15 +813,17 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['TextareaCols'] = 10;
         $GLOBALS['cfg']['CharTextareaRows'] = 5;
         $GLOBALS['cfg']['CharTextareaCols'] = 1;
+        $GLOBALS['cfg']['LimitChars'] = 20;
 
         $column['is_char'] = true;
+        $column['Type'] = 'char(10)';
         $result = PMA_getTextarea(
             $column, 'a', 'b', 'd', 2, 0, 1, "abc/", 'foobar'
         );
 
         $this->assertTag(
             PMA_getTagArray(
-                '<textarea name="fieldsb" class="char" rows="5" cols="1" dir="abc/" '
+                '<textarea name="fieldsb" class="char" maxlength="10" rows="5" cols="1" dir="abc/" '
                 . 'id="field_1_3" tabindex="2">',
                 array('content' => 'foobar')
             ),
@@ -1180,10 +1182,12 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['ProtectBinary'] = false;
         $column['is_blob'] = true;
         $column['is_char'] = true;
+        $column['Type'] = 'char(255)';
         $GLOBALS['cfg']['TextareaRows'] = 20;
         $GLOBALS['cfg']['TextareaCols'] = 10;
         $GLOBALS['cfg']['CharTextareaRows'] = 5;
         $GLOBALS['cfg']['CharTextareaCols'] = 1;
+        $GLOBALS['cfg']['LimitChars'] = 100;
 
         $result = PMA_getBinaryAndBlobColumn(
             $column, '1223', null, 20, 'a', 'b', 'c', 2, 1, 1, '/', null,
@@ -1192,7 +1196,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             "\na\n"
-            . '<textarea name="fieldsb" class="char" rows="5" cols="1" dir="/" '
+            . '<textarea name="fieldsb" class="char" maxlength="255" rows="5" cols="1" dir="/" '
             . 'id="field_1_3" c tabindex="3"></textarea><br /><input type="file" '
             . 'name="fields_uploadfoo[123]" class="textfield" id="field_1_3" '
             . 'size="10" c/>&nbsp;(Max: 64KiB)' . "\n",
@@ -1320,6 +1324,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
     {
         $column['len'] = 20;
         $column['is_char'] = true;
+        $column['Type'] = 'char(25)';
         $GLOBALS['cfg']['CharEditing'] = '';
         $GLOBALS['cfg']['MaxSizeForInputField'] = 30;
         $GLOBALS['cfg']['MinSizeForInputField'] = 10;
@@ -1327,6 +1332,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['TextareaCols'] = 10;
         $GLOBALS['cfg']['CharTextareaRows'] = 5;
         $GLOBALS['cfg']['CharTextareaCols'] = 1;
+        $GLOBALS['cfg']['LimitChars'] = 50;
 
         $extracted_columnspec['spec_in_brackets'] = 25;
         $result = PMA_getValueColumnForOtherDatatypes(
@@ -1336,7 +1342,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             "a\n\na\n"
-            . '<textarea name="fieldsb" class="char" rows="5" cols="1" dir="/" '
+            . '<textarea name="fieldsb" class="char" maxlength="25" rows="5" cols="1" dir="/" '
             . 'id="field_1_3" c tabindex="34">&lt;</textarea>',
             $result
         );