diff --git a/components/calendar/CalendarEvent.vue b/components/calendar/CalendarEvent.vue
index 736b6cb..fe1abba 100644
--- a/components/calendar/CalendarEvent.vue
+++ b/components/calendar/CalendarEvent.vue
@@ -10,6 +10,8 @@ const props = defineProps<{
 }>()
 
 const { areDatesIdentical } = useCalendar()
+const { revealEditEventModal } = useCalendarEvents()
+const { lastActiveEvent } = storeToRefs(useCalendarEvents())
 
 const spansMultipleDays = Boolean(props.event.startDate && props.event.endDate)
 const isStartEvent = spansMultipleDays && areDatesIdentical(props.tileDate, props.event.startDate)
@@ -22,6 +24,12 @@ const eventTitle = computed<string>(() => props.event.title.length <= titleCharL
 // Popover code
 const isPopoverDetailsOpen = ref<boolean>(false)
 
+function handleDoubleClick() {
+  isPopoverDetailsOpen.value = false
+  lastActiveEvent.value = { ...props.event }
+  revealEditEventModal()
+}
+
 function handleClosePopover() {
   isPopoverDetailsOpen.value = false
 }
@@ -58,6 +66,7 @@ function handleClosePopover() {
             'rounded-l-none': isEndEvent
           })
         "
+        @dblclick="handleDoubleClick"
       >
         <div class="line-clamp-2 [overflow-wrap:anywhere] hyphens-auto">
           {{ eventTitle }}
diff --git a/components/calendar/CalendarEventDetails.vue b/components/calendar/CalendarEventDetails.vue
index 3ae0c96..7a14659 100644
--- a/components/calendar/CalendarEventDetails.vue
+++ b/components/calendar/CalendarEventDetails.vue
@@ -67,6 +67,7 @@ function deployDeleteModal() {
     :side="'left'"
     :collision-padding="60"
     :hide-when-detached="true"
+    :disable-outside-pointer-events="true"
     :class="{
       'border-slate-800': !event.category,
       'border-lime-800': event.category?.name === 'naissance',