diff --git a/components/Calendar.vue b/components/Calendar.vue
index 327241ac..8426f0c0 100644
--- a/components/Calendar.vue
+++ b/components/Calendar.vue
@@ -1,17 +1,18 @@
 <template lang="pug">
   #calendar
-    vc-calendar(
+    vc-date-picker(
+      v-model='selectedDate'
       title-position='left'
       :is-dark="settings['theme.is_dark']"
       :columns="$screens({ sm: 2 }, 1)"
+      @input='click'
       @update:from-page='updatePage'
       :locale='$i18n.locale'
       :attributes='attributes'
       transition='fade'
       aria-label='Calendar'
       is-expanded
-      is-inline
-      @dayclick='click')
+      is-inline)
 
 </template>
 <script>
@@ -28,6 +29,7 @@ export default {
     const month = dayjs().month() + 1
     const year = dayjs().year()
     return {
+      selectedDate: null,
       page: { month, year }
     }
   },
diff --git a/pages/index.vue b/pages/index.vue
index 168433fd..534240a9 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -15,7 +15,7 @@
 
       .col.pt-0.pt-md-2
         Search(:filters='filters' @update='updateFilters')
-        v-chip(v-show='selectedDay' close :close-icon='mdiCloseCircle' @click:close='dayChange({ date: selectedDay})') {{selectedDay}}
+        v-chip(v-if='selectedDay' close :close-icon='mdiCloseCircle' @click:close='dayChange({ date: selectedDay})') {{selectedDay}}
 
     //- Events
     #events.mb-2.mt-1.pl-1.pl-sm-2
@@ -175,12 +175,7 @@ export default {
       this.setFilters(filters)
     },
     dayChange (day) {
-      const date = dayjs(day.date).format('YYYY-MM-DD')
-      if (this.selectedDay === date) {
-        this.selectedDay = null
-        return
-      }
-      this.selectedDay = date
+      this.selectedDay = day ? dayjs(day).format('YYYY-MM-DD') : null
     }
   }
 }