diff --git a/js/functions.js b/js/functions.js
index 9b2f662916..4dbdafd534 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -465,6 +465,9 @@ function PMA_addDatepicker($this_element, type, options)
         onClose: function (dateText, dp_inst) {
             // The value is no more from the date picker
             $this_element.data('comes_from', '');
+            if (typeof $this_element.data('datepicker') !== 'undefined') {
+                $this_element.data('datepicker').inline = false;
+            }
         }
     };
     if (type == "datetime" || type == "timestamp") {
diff --git a/js/tbl_change.js b/js/tbl_change.js
index f8f64fe039..10c10d3ddf 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -168,7 +168,10 @@ function verificationsAfterFieldChange(urlField, multi_edit, theType)
     var $this_function = $("select[name='funcs[multi_edit][" + multi_edit + "][" +
         urlField + "]']");
     var function_selected = false;
-    if (typeof $this_function.val() !== 'undefined' && $this_function.val().length > 0) {
+    if (typeof $this_function.val() !== 'undefined'
+        && $this_function.val() !== null
+        && $this_function.val().length > 0
+    ) {
         function_selected = true;
     }