diff --git a/src/modules/events/views/EventsPage.vue b/src/modules/events/views/EventsPage.vue
index 9cb625c..121941e 100644
--- a/src/modules/events/views/EventsPage.vue
+++ b/src/modules/events/views/EventsPage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRouter, onBeforeRouteLeave } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { Button } from '@/components/ui/button'
 import {
@@ -95,6 +95,13 @@ function onSelectDate(date: Date) {
   // The popup closes itself; just apply the day filter.
   selectDate(date)
 }
+
+// Safety: never let the date-picker popup persist across navigation —
+// e.g. it should not reappear when returning to the feed from an event
+// detail page.
+onBeforeRouteLeave(() => {
+  calendarOpen.value = false
+})
 </script>
 
 <template>
diff --git a/src/modules/events/views/MyTicketsPage.vue b/src/modules/events/views/MyTicketsPage.vue
index de9ae09..b21312c 100644
--- a/src/modules/events/views/MyTicketsPage.vue
+++ b/src/modules/events/views/MyTicketsPage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, onMounted, ref, watch } from 'vue'
-import { RouterLink } from 'vue-router'
+import { RouterLink, onBeforeRouteLeave } from 'vue-router'
 import { useUserTickets } from '../composables/useUserTickets'
 import { useEvents } from '../composables/useEvents'
 import { useEventsStore } from '../stores/events'
@@ -88,6 +88,11 @@ function onSelectDay(date: Date) {
   selectedDay.value = date
 }
 
+// Don't let the calendar popup persist across navigation.
+onBeforeRouteLeave(() => {
+  calendarOpen.value = false
+})
+
 const visibleGroups = computed(() => {
   if (selectedDay.value) {
     return groupedTickets.value.filter(g => isGroupOnDay(g.eventId, selectedDay.value!))