diff --git a/client/components/forms/DateInput.vue b/client/components/forms/DateInput.vue
index fdee6f77..0cdcb14b 100644
--- a/client/components/forms/DateInput.vue
+++ b/client/components/forms/DateInput.vue
@@ -71,7 +71,7 @@
           :max-date="maxDate"
           :is-dark="props.isDark"
           color="form-color"
-          @close="close"
+          @update:modelValue="updateModelValue"
         />
         <DatePicker
           v-else
@@ -84,7 +84,7 @@
           :max-date="maxDate"
           :is-dark="props.isDark"
           color="form-color"
-          @close="close"
+          @update:modelValue="updateModelValue"
         />
       </template>
     </UPopover>
@@ -143,6 +143,12 @@ const modeledValue = computed({
   }
 })
 
+const updateModelValue = () => {
+  if (!props.withTime && !props.dateRange) {
+    pickerOpen.value = false
+  }
+}
+
 const inputClasses = computed(() => {
   const classes = [props.theme.DateInput.input, props.theme.DateInput.borderRadius]
   if (props.disabled) {