diff --git a/ChangeLog b/ChangeLog
index 66e6c55ed1..a52649af89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@ phpMyAdmin - ChangeLog
 - issue #12320 Copying a user does not copy usergroup
 - issue #12272 Adding a new row with default enum goes to no selection when you want to add more then 2 rows
 - issue #12487 Drag and drop import prevents file dropping to blob column file selector on the insert tab
+- issue #12554 Absence of scrolling makes it impossible to read longer text values in grid editing
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 2b17bcd491..13b4b3debc 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -2321,7 +2321,8 @@ fieldset .disabled-field td {
 }
 
 .cEdit .edit_box {
-    overflow: hidden;
+    overflow-x: hidden;
+    overflow-y: scroll;
     padding: 0;
 }
 
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 50f6d22a86..a4177400f3 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -2873,7 +2873,8 @@ fieldset .disabled-field td {
 }
 
 .cEdit .edit_box {
-    overflow: hidden;
+    overflow-x: hidden;
+    overflow-y: scroll;
     padding: 0;
     margin: 0;
 }