diff --git a/js/functions.js b/js/functions.js
index 91c9bd734d..80b4be7aff 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -353,7 +353,15 @@ function PMA_addDatepicker($this_element, type, options)
             // Remember that we came from the datepicker; this is used
             // in tbl_change.js by verificationsAfterFieldChange()
             $this_element.data('comes_from', 'datepicker');
-
+            if ($(input).closest('.cEdit').length > 0) {
+                setTimeout(function () {
+                    inst.dpDiv.css({
+                        top: 0,
+                        left: 0,
+                        position: 'relative'
+                    });
+                }, 0);
+            }
             // Fix wrong timepicker z-index, doesn't work without timeout
             setTimeout(function () {
                 $('#ui-timepicker-div').css('z-index', $('#ui-datepicker-div').css('z-index'));
diff --git a/js/makegrid.js b/js/makegrid.js
index e24e6e3065..58ab633491 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -697,6 +697,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             // destroy datepicker in edit area, if exist
             var $dp = $(g.cEdit).find('.hasDatepicker');
             if ($dp.length > 0) {
+                $(document).bind('mousedown', $.datepicker._checkExternalClick);
                 $dp.datepicker('destroy');
                 // change the cursor in edit box back to normal
                 // (the cursor become a hand pointer when we add datepicker)
@@ -1032,6 +1033,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     });
 
                     $input_field.datepicker("show");
+                    // unbind the mousedown event to prevent the problem of
+                    // datepicker getting closed, needs to be checked for any
+                    // change in names when updating
+                    $(document).unbind('mousedown', $.datepicker._checkExternalClick);
 
                     //move ui-datepicker-div inside cEdit div
                     var datepicker_div = $('#ui-datepicker-div');