diff --git a/js/functions.js b/js/functions.js
index b5e44a9269..b41e3599fa 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -359,9 +359,13 @@ function PMA_addDatepicker($this_element, type, options)
                 $('#ui-timepicker-div').css('z-index', $('#ui-datepicker-div').css('z-index'));
             }, 0);
         },
+        onSelect: function() {
+            $this_element.data('datepicker').inline = true;                               
+        },
         onClose: function (dateText, dp_inst) {
             // The value is no more from the date picker
             $this_element.data('comes_from', '');
+            $this_element.data('datepicker').inline = false;
         }
     };
     if (type == "datetime" || type == "timestamp") {