diff --git a/components/calendar/dialog/QuickCreateEvent.vue b/components/calendar/dialog/QuickCreateEvent.vue
index 46ad36d..98668b7 100644
--- a/components/calendar/dialog/QuickCreateEvent.vue
+++ b/components/calendar/dialog/QuickCreateEvent.vue
@@ -42,6 +42,7 @@ const breakpoints = useBreakpoints(
   <UiDialog v-model:open="isDialogOpen">
     <UiDialogContent
       class="border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
+      :trap-focus="true"
       @escape-key-down.prevent="handleClosing"
       @pointer-down-outside.prevent="handleClosing"
     >
diff --git a/components/calendar/state/monthly/Layout.vue b/components/calendar/state/monthly/Layout.vue
index a617626..1d5019f 100644
--- a/components/calendar/state/monthly/Layout.vue
+++ b/components/calendar/state/monthly/Layout.vue
@@ -77,11 +77,9 @@ function handleClosing() {
       <UiDialog v-model:open="isDialogOpen">
         <UiDialogContent
           class="border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
-          :disable-outside-pointer-events="true"
           :trap-focus="true"
-          @focus-outside="handleClosing"
-          @interact-outside="handleClosing"
-          @close-auto-focus="(e) => e.preventDefault()"
+          @escape-key-down.prevent="handleClosing"
+          @pointer-down-outside.prevent="null"
         >
           <UiDialogTitle>
             {{ $t("entity.calendar.event.addSingle") }}