diff --git a/js/makegrid.js b/js/makegrid.js
index 0f9c417aaf..a6169c11de 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -799,6 +799,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     });
                 }
 
+                //reset the position of the edit_area div after closing datetime picker
+                $('.edit_area').css({'top' :'0','position':''});
+
                 if ($td.is('.relation')) {
                     //handle relations
                     $editArea.addClass('edit_area_loading');
@@ -1708,9 +1711,9 @@ 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) {
-                    g.hideEditCell();
+                // hide edit cell if the click is not from the datepicker or edit area
+                if ($(e.target).parents().index($('#ui-datepicker-div')) == -1 && $(e.target).parents().index($('.cEdit .edit_area')) == -1){
+                   g.hideEditCell();
                 }
             }).keydown(function (e) {
                 if (e.which == 27 && g.isCellEditActive) {