diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 3c3565c710..dc16cd9d72 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -185,8 +185,8 @@ function PMA_getHtmlForTableNameAndNoOfColumns()
         . '</td>'
         . '<td>';
     $html .= sprintf(
-        __('Add %s column(s)'), '<input type="text" id="added_fields" '
-        . 'name="added_fields" size="2" value="1" onfocus="this.select'
+        __('Add %s column(s)'), '<input type="number" id="added_fields" '
+        . 'name="added_fields" size="2" value="1" min="1" onfocus="this.select'
         . '()" />'
     );
 
diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php
index 69a719005d..32c3e97fb3 100644
--- a/test/libraries/PMA_tbl_columns_definition_form_test.php
+++ b/test/libraries/PMA_tbl_columns_definition_form_test.php
@@ -231,8 +231,8 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase
 
         $this->assertTag(
             PMA_getTagArray(
-                '<input type="text" id="added_fields" name="added_fields" '
-                . 'size="2" value="1" onfocus="this.select()"'
+                '<input type="number" id="added_fields" name="added_fields" '
+                . 'size="2" value="1" min="1" onfocus="this.select()"'
             ),
             $result
         );