diff --git a/ChangeLog b/ChangeLog
index dad7fbe10a..f5eb9715a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
 - bug #3794 failure to handle repeating empty columns when importing ODS
 - bug #4638 Default Export Method setting broken
 - bug #4639 Export SQL missing indentation first field
+- bug #4637 Field Alignment
 
 4.3.1.0 (2014-12-08)
 - bug #4609 'Show all' checkbox label is not clickable
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index b605cd4d0b..69554d7d44 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -200,6 +200,14 @@ input[type=date] {
     border: 1px solid #aaa;
     color: #555;
     padding: 4px;
+}
+
+input[type=text],
+input[type=password],
+input[type=number],
+input[type=date],
+input[type=checkbox],
+select {
     margin: 6px;
 }
 
@@ -2561,10 +2569,6 @@ fieldset .disabled-field td {
     -webkit-box-sizing: border-box;
 }
 
-#table_columns select {
-    margin: 0 6px;
-}
-
 #placeholder {
     position: relative;
     border: 1px solid #aaa;