diff --git a/src/components/overview/AgendaView.vue b/src/components/overview/AgendaView.vue
index fac7dfc..33d2d90 100644
--- a/src/components/overview/AgendaView.vue
+++ b/src/components/overview/AgendaView.vue
@@ -24,13 +24,13 @@
           <q-separator vertical />
           <q-btn flat dense
             >{{ asMonth(selectedDate) }} {{ asYear(selectedDate) }}
-            <q-popup-proxy transition-show="scale" transition-hide="scale">
+            <q-popup-proxy ref="proxy" transition-show="scale" transition-hide="scale">
               <q-date
                 ref="datepicker"
-                v-model="selectedDate"
-                v-close-popup
+                :model-value="selectedDate"
                 mask="YYYY-MM-DD"
                 no-unset
+                @update:model-value="updateDate"
                 ><q-btn v-close-popup label="jetzt" dense flat @click="datepicker?.setToday()"
               /></q-date>
             </q-popup-proxy>
@@ -91,7 +91,7 @@
 import { ComponentPublicInstance, computed, defineComponent, onBeforeMount, ref } from 'vue';
 import { useEventStore } from '../../store';
 import EventSlot from './slots/EventSlot.vue';
-import { date, QDate, useQuasar } from 'quasar';
+import { date, QDate, QPopupProxy, useQuasar } from 'quasar';
 import { startOfWeek } from '@flaschengeist/api';
 import EditEvent from '../management/EditEvent.vue';
 import { QCalendarAgenda } from '@quasar/quasar-ui-qcalendar';
@@ -105,6 +105,7 @@ export default defineComponent({
     const quasar = useQuasar();
 
     const datepicker = ref<QDate>();
+    const proxy = ref<QPopupProxy>();
 
     const selectedDate = ref(date.formatDate(new Date(), 'YYYY-MM-DD'));
     const calendarView = ref('week');
@@ -225,8 +226,13 @@ export default defineComponent({
       editDone,
       events,
       datepicker,
+      proxy,
       remove,
       selectedDate,
+      updateDate: (ds: string) => {
+        selectedDate.value = ds;
+        proxy.value?.hide();
+      },
     };
   },
 });