diff --git a/client/core/src/datePicker/datePicker.html b/client/core/src/datePicker/datePicker.html
index d91f0a53f..21839aa16 100644
--- a/client/core/src/datePicker/datePicker.html
+++ b/client/core/src/datePicker/datePicker.html
@@ -4,7 +4,8 @@
     ng-focus="$ctrl.hasFocus = true"
     ng-blur="$ctrl.hasFocus = false"
     ng-mouseenter="$ctrl.hasMouseIn = true"
-    ng-mouseleave="$ctrl.hasMouseIn = false"
+	ng-mouseleave="$ctrl.hasMouseIn = false"
+	ng-click="$ctrl.onClick()"
 >
     <input type="text"
 		class="mdl-textfield__input"
diff --git a/client/core/src/datePicker/datePicker.js b/client/core/src/datePicker/datePicker.js
index 2ebed10d6..26fba6c34 100644
--- a/client/core/src/datePicker/datePicker.js
+++ b/client/core/src/datePicker/datePicker.js
@@ -59,6 +59,11 @@ class DatePicker extends Component {
     onClear() {
         this.modelView = null;
     }
+    onClick() {
+        if (this.vp) {
+            this.vp.open();
+        }
+    }
     mdlUpdate() {
         let mdlField = this.element.firstChild.MaterialTextfield;
         if (mdlField)
@@ -167,14 +172,23 @@ class DatePicker extends Component {
         return this.iniOptions;
     }
 
-    $onInit() {
+    initPicker() {
         this.iniOptions = this._getOptions();
         this.isTimePicker = (this.iniOptions && this.iniOptions.enableTime && this.iniOptions.noCalendar);
         this.vp = new Flatpickr(this.input, this.iniOptions);
     }
-    $onDestroy() {
+    destroyPicker() {
         if (this.vp)
             this.vp.destroy();
+        this.vp = undefined;
+    }
+
+    $onInit() {
+        this.initPicker();
+    }
+
+    $onDestroy() {
+        this.destroyPicker();
     }
 }
 DatePicker.$inject = ['$element', '$translate', '$filter', '$timeout'];