diff --git a/ayanova/src/components/gzdateandtimepicker.vue b/ayanova/src/components/gzdateandtimepicker.vue
index a01f6060..75364de0 100644
--- a/ayanova/src/components/gzdateandtimepicker.vue
+++ b/ayanova/src/components/gzdateandtimepicker.vue
@@ -2,30 +2,31 @@
   <div>
     <v-layout row wrap v-if="!readonly">
       <v-flex xs6>
-        <v-dialog v-model="modal" persistent lazy full-width width="290px">
+        <v-dialog v-model="dlgdate" persistent lazy full-width width="290px">
           <template v-slot:activator="{ on }">
             <v-text-field
               v-on="on"
               prepend-icon="fa-calendar-alt"
+              @click:prepend="dlgdate = true"
               v-model="formatDate"
               v-bind:label="label"
               readonly
             ></v-text-field>
           </template>
-          <v-date-picker v-model="dateOnly" @input="modal = false">
+          <v-date-picker v-model="dateOnly" @input="dlgdate = false">
             <v-spacer></v-spacer>
-            <v-btn flat color="primary" @click="modal = false">Close</v-btn>
+            <v-btn flat color="primary" @click="dlgdate = false">Close</v-btn>
           </v-date-picker>
         </v-dialog>
       </v-flex>
       <v-flex xs6>
-        <v-dialog v-model="modal2" persistent lazy full-width width="290px">
+        <v-dialog v-model="dlgtime" persistent lazy full-width width="290px">
           <template v-slot:activator="{ on }">
-            <v-text-field v-on="on" v-model="formatTime" label prepend-icon="fa-clock" readonly></v-text-field>
+            <v-text-field v-on="on" v-model="formatTime" label prepend-icon="fa-clock" @click:prepend="dlgtime = true" readonly></v-text-field>
           </template>
           <v-time-picker v-model="timeOnly">
             <v-spacer></v-spacer>
-            <v-btn flat color="primary" @click="modal2 = false">OK</v-btn>
+            <v-btn flat color="primary" @click="dlgtime = false">OK</v-btn>
           </v-time-picker>
         </v-dialog>
       </v-flex>
@@ -51,7 +52,7 @@ export default {
       throw "GzDateAndTimePicker: $gzlocale is required and missing";
     }
   },
-  data: () => ({ date: null, modal: false, modal2: false }),
+  data: () => ({ date: null, dlgdate: false, dlgtime: false }),
   props: {
     label: String,
     value: String,