diff --git a/js/makegrid.js b/js/makegrid.js
index 0f9c417aaf..b35c572c6e 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1708,8 +1708,8 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 }
             });
             $('html').click(function (e) {
-                // hide edit cell if the click is not from the datepicker
-                if ($(e.target).parents().index($('#ui-datepicker-div')) == -1) {
+                // hide edit cell if the click is not from the datepicker or edit area
+                if ($(e.target).parents().index($('#ui-datepicker-div') && $('.cEdit .edit_area')) == -1) {  
                     g.hideEditCell();
                 }
             }).keydown(function (e) {