diff --git a/ChangeLog b/ChangeLog
index 251bb8a0d7..abcc9208c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,7 @@ phpMyAdmin - ChangeLog
 - bug       Saved chart image does not have a proper name or an extension
 - bug #4976 Timepicker CSS issues in Original theme
 - bug #4975 Move/Copy/Rename operations on Table/Db fail on Drizzle server
+- bug #4826 Two inline edit windows
 
 4.4.11.0 (2015-07-06)
 - bug       Missing selected/entered values when editing active options in visual query builder
diff --git a/js/makegrid.js b/js/makegrid.js
index 56ba25f770..51c8f31d9a 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -995,21 +995,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                             if (typeof data !== 'undefined' && data.success === true) {
                                 $td.data('original_data', data.value);
                                 $(g.cEdit).find('.edit_box').val(data.value);
-                                $editArea.append('<textarea></textarea>');
-                                $editArea.find('textarea').val(data.value);
-                                $editArea
-                                    .on('keyup', 'textarea', function (e) {
-                                        $(g.cEdit).find('.edit_box').val($(this).val());
-                                    });
-                                $(g.cEdit).on('keyup', '.edit_box', function (e) {
-                                    $editArea.find('textarea').val($(this).val());
-                                });
-                                $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
                             } else {
                                 PMA_ajaxShowMessage(data.error, false);
                             }
                         }); // end $.post()
-                        $editArea.show();
                     }
                     g.isEditCellTextEditable = true;
                 } else if ($td.is('.timefield, .datefield, .datetimefield, .timestampfield')) {