diff --git a/javascript/src/Form.js b/javascript/src/Form.js
index 31216f71c2d44c72ced1d1efd11be03021ebcfb3..359f7a230a5603555ee5c3e4588ff9c3ac228685 100644
--- a/javascript/src/Form.js
+++ b/javascript/src/Form.js
@@ -78,7 +78,8 @@ var QfqNS = QfqNS || {};
         }
 
         var formObject = this;
-        this.$form.find(".qfq-datepicker").on("click", function(e){
+        // Open datetimepicker over click event even if first element is already focused and get all changes of datetimepicker for dirty lock
+        this.$form.find(".qfq-datepicker").on("click", function(){
             triggerFocus(this);
             getDatetimePickerChanges();
         });
diff --git a/javascript/src/QfqForm.js b/javascript/src/QfqForm.js
index 9c523b77c66570f7c0782eb5a31235b539d5a252..798d41a9c8dcebc4a4e7f472feb7961c650375d3 100644
--- a/javascript/src/QfqForm.js
+++ b/javascript/src/QfqForm.js
@@ -513,7 +513,7 @@ var QfqNS = QfqNS || {};
 
     /* Dynamic Update Trigger */
     n.QfqForm.prototype.setupFormUpdateHandler = function () {
-        $('textarea[data-load],input[data-load],select[data-load]').on('change', this.formUpdateHandler.bind(this));
+        $('textarea[data-load],input[data-load],select[data-load]').on('change dp.change', this.formUpdateHandler.bind(this));
     };
 
     n.QfqForm.prototype.formUpdateHandler = function () {