diff --git a/js/makegrid.js b/js/makegrid.js
index 48f311e79c..4ed8fa742e 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -754,7 +754,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
 
                 // empty all edit area, then rebuild it based on $td classes
                 $editArea.empty();
-                $editArea.removeClass('edit_area_right');
 
                 // remember this instead of testing more than once
                 var is_null = $td.is('.null');
@@ -1069,10 +1068,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                         $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
                     }
                 }
-                if ($(g.cEdit).offset().left + $editArea.outerWidth() > $(document.body).width()) {
-                    $editArea.addClass('edit_area_right');
-                    $editArea.css('top','');
-                }
                 if ($editArea.children().length > 0 && !is_null) {
                     $editArea.show();
                 }
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 455ac98ead..58b6cd1b67 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -2277,11 +2277,6 @@ fieldset .disabled-field td {
     height: 10em;
 }
 
-.cEdit .edit_area_right {
-    position: absolute;
-    right: 0;
-}
-
 .cEdit .goto_link {
     background: #EEE;
     color: #555;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 45f1f9ba4a..46d4ac1eca 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -2851,11 +2851,6 @@ fieldset .disabled-field td {
     height: 10em;
 }
 
-.cEdit .edit_area_right {
-    position: absolute;
-    right: 0;
-}
-
 .cEdit .goto_link {
     background: #EEE;
     color: #555;