diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 45b92f094b..1b5ee20c91 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -230,11 +230,11 @@ function PMA_displayInput($path, $name, $type, $value, $description = '',
 
     switch ($type) {
     case 'text':
-        $htmlOutput .= '<input type="text" size="60" ' . $name_id . $field_class
+        $htmlOutput .= '<input type="text" size="40" ' . $name_id . $field_class
             . ' value="' . htmlspecialchars($value) . '" />';
         break;
     case 'password':
-        $htmlOutput .= '<input type="password" size="60" ' . $name_id . $field_class
+        $htmlOutput .= '<input type="password" size="40" ' . $name_id . $field_class
             . ' value="' . htmlspecialchars($value) . '" />';
         break;
     case 'short_text':
diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php
index a3355c0f89..93ecfc41b3 100644
--- a/test/libraries/PMA_FormDisplay_tpl_test.php
+++ b/test/libraries/PMA_FormDisplay_tpl_test.php
@@ -200,7 +200,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
         );
 
         $this->assertContains(
-            '<input type="text" size="60" name="test/path" id="test/path" ' .
+            '<input type="text" size="40" name="test/path" id="test/path" ' .
             'class="custom field-error" value="val" />',
             $result
         );