diff --git a/components/calendar/Calendar.vue b/components/calendar/Calendar.vue
index 2dd6b7f..37c312b 100644
--- a/components/calendar/Calendar.vue
+++ b/components/calendar/Calendar.vue
@@ -53,8 +53,8 @@ onMounted(() => {
       <component :is="currentViewComponent" />
 
       <CalendarSearch />
-      <CalendarFormUpdateEvent />
-      <CalendarFormDeleteEvent />
+      <CalendarDialogUpdateEvent />
+      <CalendarDialogDeleteEvent />
     </div>
   </div>
 </template>
diff --git a/components/calendar/CalendarEventDetails.vue b/components/calendar/CalendarEventDetails.vue
index c1046ca..8d8afa7 100644
--- a/components/calendar/CalendarEventDetails.vue
+++ b/components/calendar/CalendarEventDetails.vue
@@ -46,6 +46,7 @@ function deployEditModal() {
   lastActiveEvent.value = { ...props.event }
   revealEditEventModal()
   commandMenuOpened.value = false
+  emit("query:close-popover")
 }
 
 /**
@@ -55,6 +56,7 @@ function deployDeleteModal() {
   lastActiveEvent.value = { ...props.event }
   revealDeleteEventModal()
   commandMenuOpened.value = false
+  emit("query:close-popover")
 }
 </script>
 
diff --git a/components/calendar/CalendarMenu.vue b/components/calendar/CalendarMenu.vue
index ce2b3da..12f593e 100644
--- a/components/calendar/CalendarMenu.vue
+++ b/components/calendar/CalendarMenu.vue
@@ -10,7 +10,10 @@ const { revealAdvancedSearch } = useCalendar()
   <header class="pt-4 border-slate-400 dark:border-slate-700 border-b-[1px]">
     <div class="px-6 flex justify-between">
       <menu class="flex items-center gap-2">
-        <li class="flex items-center">
+        <li>
+          <CalendarDialogQuickCreateEvent />
+        </li>
+        <li>
           <CalendarMenuToday />
         </li>
         <li>
diff --git a/components/calendar/CalendarMenuToday.vue b/components/calendar/CalendarMenuToday.vue
index 13bf872..5860fc4 100644
--- a/components/calendar/CalendarMenuToday.vue
+++ b/components/calendar/CalendarMenuToday.vue
@@ -14,7 +14,7 @@ const buttonDisabledState: ComputedRef<boolean> = computed<boolean>(() => {
   <UiTooltipProvider :delay-duration="250">
     <UiTooltip>
       <UiTooltipTrigger as-child>
-        <UiButton size="sm" :disabled="buttonDisabledState" @click="jumpToDefaultDate">
+        <UiButton size="sm" variant="secondary" :disabled="buttonDisabledState" @click="jumpToDefaultDate">
           {{ $t('entity.calendar.date.today') }}
         </UiButton>
       </UiTooltipTrigger>
diff --git a/components/calendar/dialog/CreateEvent.vue b/components/calendar/dialog/CreateEvent.vue
new file mode 100644
index 0000000..e3619eb
--- /dev/null
+++ b/components/calendar/dialog/CreateEvent.vue
@@ -0,0 +1,68 @@
+<script lang="ts" setup>
+import type { RPGDate } from "~/models/Date";
+
+const { eventSkeleton, operationInProgress } = storeToRefs(useCalendar())
+const { resetSkeleton } = useCalendar()
+const popoverOpen = ref(false)
+
+const isLoading = ref(false)
+
+const props = defineProps<{
+  date?: RPGDate
+  btnClass?: string
+}>()
+
+/**
+ * Opens event creation's popover
+ */
+function openEventCreatePopover() {
+  // If another operation is in progress, whether it's another create popup or a modal, don't bother opening it
+  if (operationInProgress.value) {
+    popoverOpen.value = false
+    return
+  }
+
+  resetSkeleton()
+
+  popoverOpen.value = true
+
+  // Set skeleton initial startDate if it's known
+  if (props.date) {
+    eventSkeleton.value.startDate = { ...props.date } // We need to clone it otherwise the props ends up mutating (?)
+  }
+}
+
+/**
+ * Prevents the modal from closing if's still loading
+ *
+ * @param e The closing event (can be keydown or click)
+ */
+function handleClosing(e: Event) {
+  if (isLoading.value) {
+    popoverOpen.value = false
+    e.preventDefault()
+  }
+}
+</script>
+
+<template>
+  <UiPopover v-model:open="popoverOpen">
+    <UiPopoverTrigger as-child>
+      <button :class="btnClass" @click="openEventCreatePopover()" />
+    </UiPopoverTrigger>
+    <UiPopoverContent
+      :align="'center'"
+      :side="'right'"
+      :collision-padding="60"
+      :disable-outside-pointer-events="true"
+      :trap-focus="true"
+      class="pl-3 w-[30rem] max-w-full border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
+      @escape-key-down="handleClosing"
+      @focus-outside="handleClosing"
+      @interact-outside="handleClosing"
+      @pointer-down-outside="handleClosing"
+    >
+      <CalendarFormCreateEvent @event-created="handleClosing" />
+    </UiPopoverContent>
+  </UiPopover>
+</template>
diff --git a/components/calendar/dialog/DeleteEvent.vue b/components/calendar/dialog/DeleteEvent.vue
new file mode 100644
index 0000000..1e02d55
--- /dev/null
+++ b/components/calendar/dialog/DeleteEvent.vue
@@ -0,0 +1,45 @@
+<script lang="ts" setup>
+const { isDeleteEventModalOpen, eventSkeleton, lastActiveEvent } = storeToRefs(useCalendar())
+
+const isLoading = ref<boolean>(false)
+
+// Watch the popover state
+watch(isDeleteEventModalOpen, (hasOpened, _o) => {
+  if (hasOpened && lastActiveEvent.value) {
+    eventSkeleton.value = { ...lastActiveEvent.value }
+  }
+})
+
+/**
+ * Prevents the modal from closing if's still loading
+ *
+ * @param e The closing event (can be keydown or click)
+ */
+function handleClosing(e: Event): void {
+  if (isLoading.value) {
+    e.preventDefault()
+  }
+}
+</script>
+
+<template>
+  <UiAlertDialog v-model:open="isDeleteEventModalOpen">
+    <UiAlertDialogContent
+      :disable-outside-pointer-events="true"
+      :trap-focus="true"
+      class="min-w-96 border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
+      @escape-key-down="handleClosing"
+      @focus-outside="handleClosing"
+      @interact-outside="handleClosing"
+      @pointer-down-outside="handleClosing"
+    >
+      <UiAlertDialogTitle>{{ $t('entity.calendar.event.deleteDialog.title') }}</UiAlertDialogTitle>
+
+      <UiAlertDialogDescription>
+        {{ $t('entity.calendar.event.deleteDialog.subtitle') }}
+      </UiAlertDialogDescription>
+
+      <CalendarFormDeleteEvent />
+    </UiAlertDialogContent>
+  </UiAlertDialog>
+</template>
diff --git a/components/calendar/dialog/QuickCreateEvent.vue b/components/calendar/dialog/QuickCreateEvent.vue
new file mode 100644
index 0000000..3e487e7
--- /dev/null
+++ b/components/calendar/dialog/QuickCreateEvent.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+import { PhPlus } from "@phosphor-icons/vue";
+
+const isDialogOpen = ref<boolean>(false);
+
+// Toggles the dialog
+function toggleDialog() {
+  isDialogOpen.value = !isDialogOpen.value;
+};
+</script>
+
+<template>
+  <UiButton @click="toggleDialog">
+    <PhPlus size="18" weight="bold" />
+
+    <strong class="font-semibold">
+      {{ $t("entity.calendar.event.newEvent") }}
+    </strong>
+  </UiButton>
+
+  <UiDialog v-model:open="isDialogOpen">
+    <UiDialogContent class="border-indigo-200 dark:bg-slate-950 dark:border-indigo-950">
+      <UiDialogTitle>
+        {{ $t("entity.calendar.event.addSingle") }}
+      </UiDialogTitle>
+      <CalendarFormCreateEvent />
+    </UiDialogContent>
+  </UiDialog>
+</template>
diff --git a/components/calendar/dialog/UpdateEvent.vue b/components/calendar/dialog/UpdateEvent.vue
new file mode 100644
index 0000000..46003e6
--- /dev/null
+++ b/components/calendar/dialog/UpdateEvent.vue
@@ -0,0 +1,49 @@
+<script lang="ts" setup>
+const { eventSkeleton, lastActiveEvent, isEditEventModalOpen } = storeToRefs(useCalendar())
+
+const isLoading = ref(false)
+
+// Watch the popover state
+watch(isEditEventModalOpen, (hasOpened, _o) => {
+  if (hasOpened && lastActiveEvent.value) {
+    eventSkeleton.value = { ...lastActiveEvent.value }
+  }
+})
+
+/**
+ * Prevents the modal from closing if's still loading
+ *
+ * @param e The closing event (can be keydown or click)
+ */
+function handleClosing(e: Event) {
+  if (isLoading.value) {
+    e.preventDefault()
+  }
+}
+</script>
+
+<template>
+  <UiDialog v-model:open="isEditEventModalOpen">
+    <UiDialogContent
+      :disable-outside-pointer-events="true"
+      :trap-focus="true"
+      class="pl-3 min-w-96 border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
+      @escape-key-down="handleClosing"
+      @focus-outside="handleClosing"
+      @interact-outside="handleClosing"
+      @pointer-down-outside="(e) => e.preventDefault()"
+    >
+      <header class="pl-8 grid gap-y-2">
+        <UiDialogTitle>
+          {{ $t('entity.calendar.event.editDialog.title') }}
+        </UiDialogTitle>
+
+        <UiDialogDescription>
+          {{ $t('entity.calendar.event.editDialog.subtitle') }}
+        </UiDialogDescription>
+      </header>
+
+      <CalendarFormUpdateEvent />
+    </UiDialogContent>
+  </UiDialog>
+</template>
diff --git a/components/calendar/form/CreateEvent.vue b/components/calendar/form/CreateEvent.vue
index 65003ee..bc2396e 100644
--- a/components/calendar/form/CreateEvent.vue
+++ b/components/calendar/form/CreateEvent.vue
@@ -2,9 +2,10 @@
 import type { RPGDate } from "~/models/Date";
 import { PhAlarm, PhCircleNotch, PhEye, PhEyeClosed, PhMapPinArea, PhTag } from "@phosphor-icons/vue"
 
-const { eventSkeleton, operationInProgress } = storeToRefs(useCalendar())
-const { resetSkeleton, submitSkeleton, cancelLatestRequest } = useCalendar()
-const popoverOpen = ref(false)
+const emit = defineEmits(["event-created"])
+
+const { eventSkeleton } = storeToRefs(useCalendar())
+const { submitSkeleton, cancelLatestRequest } = useCalendar()
 
 const { t } = useI18n()
 
@@ -19,26 +20,6 @@ const props = defineProps<{
   btnClass?: string
 }>()
 
-/**
- * Opens event creation's popover
- */
-function openEventCreatePopover() {
-  // If another operation is in progress, whether it's another create popup or a modal, don't bother opening it
-  if (operationInProgress.value) {
-    popoverOpen.value = false
-    return
-  }
-
-  resetSkeleton()
-
-  popoverOpen.value = true
-
-  // Set skeleton initial startDate if it's known
-  if (props.date) {
-    eventSkeleton.value.startDate = { ...props.date } // We need to clone it otherwise the props ends up mutating (?)
-  }
-}
-
 async function handleSubmit() {
   // Prevent form submission if already loading
   if (isLoading.value) return
@@ -48,7 +29,7 @@ async function handleSubmit() {
   try {
     await submitSkeleton()
 
-    popoverOpen.value = false
+    emit("event-created")
   } catch (err) {
     if (err instanceof Error) {
       formErrors.message = err.message
@@ -58,17 +39,6 @@ async function handleSubmit() {
   }
 }
 
-/**
- * Prevents the modal from closing if's still loading
- *
- * @param e The closing event (can be keydown or click)
- */
-function handleClosing(e: Event) {
-  if (isLoading.value) {
-    e.preventDefault()
-  }
-}
-
 /**
  * Click on the cancel button
  *
@@ -81,160 +51,141 @@ function handleCancel() {
 </script>
 
 <template>
-  <UiPopover v-model:open="popoverOpen">
-    <UiPopoverTrigger as-child>
-      <button :class="btnClass" @click="openEventCreatePopover()" />
-    </UiPopoverTrigger>
-    <UiPopoverContent
-      :align="'center'"
-      :side="'right'"
-      :collision-padding="60"
-      :disable-outside-pointer-events="true"
-      :trap-focus="true"
-      class="pl-3 w-[30rem] max-w-full border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
-      @escape-key-down="handleClosing"
-      @focus-outside="handleClosing"
-      @interact-outside="handleClosing"
-      @pointer-down-outside="handleClosing"
-    >
-      <form @submit.prevent="handleSubmit">
-        <div class="grid grid-cols-2 gap-y-3">
-          <div class="col-span-2 pl-8">
+  <form @submit.prevent="handleSubmit">
+    <div class="grid grid-cols-2 gap-y-3">
+      <div class="col-span-2 pl-8">
+        <input
+          id="new-event-title"
+          v-model="eventSkeleton.title"
+          type="text"
+          name="new-event-title"
+          required
+          :placeholder="$t('entity.calendar.event.title')"
+          :maxlength="120"
+          pattern="([A-Za-zÀ-ÖØ-öø-ÿ0-9\s\&\-\~]+){3,120}"
+          class="w-full -my-1 py-1 -mx-1 px-1 text-lg border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500"
+        >
+        <div class="mt-2 mb-1 text-xs opacity-50">
+          {{ t('entity.calendar.event.patterns.title') }}
+        </div>
+      </div>
+
+      <div class="col-span-2 my-2 pl-8">
+        <textarea
+          id="new-event-description"
+          v-model="eventSkeleton.description"
+          name="new-event-description"
+          :placeholder="$t('entity.addDescription')"
+          :maxlength="1200"
+          class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500"
+        />
+        <div class="mt-2 mb-1 text-xs opacity-50">
+          {{ t('entity.calendar.event.patterns.description') }}
+        </div>
+      </div>
+
+      <div class="col-span-2">
+        <div class="flex items-center gap-4">
+          <PhAlarm size="18" weight="fill" />
+
+          <CalendarInputRPGDate
+            v-model:model-value="eventSkeleton.startDate"
+            :placeholder="$t('entity.calendar.date.start')"
+            :initial-date="props.date"
+            :required="true"
+          />
+
+          <span>—</span>
+
+          <CalendarInputRPGDate
+            v-model:model-value="eventSkeleton.endDate"
+            :placeholder="$t('entity.calendar.date.end')"
+            :initial-date="props.date"
+          />
+        </div>
+      </div>
+
+      <div class="col-span-2">
+        <div class="flex items-center gap-4">
+          <PhTag size="18" weight="fill" />
+
+          <CalendarInputEventCategory
+            v-model="eventSkeleton.category"
+            :placeholder="$t('entity.category.addPrimary')"
+          />
+        </div>
+      </div>
+
+      <!-- <div class="col-span-2">
+        <div class="flex items-center gap-4">
+          <PhTag size="18" weight="fill" />
+
+          <CalendarInputEventCategories v-model="eventSkeleton.secondaryCategories" :placeholder="$t('entity.category.addSecondaries')" />
+        </div>
+      </div> -->
+
+      <div class="col-span-2 mb-2">
+        <div class="flex items-center gap-4">
+          <PhMapPinArea size="18" weight="fill" />
+
+          <div class="grow">
             <input
-              id="new-event-title"
-              v-model="eventSkeleton.title"
+              id="new-event-location"
+              v-model="eventSkeleton.location"
               type="text"
-              name="new-event-title"
-              required
-              :placeholder="$t('entity.calendar.event.title')"
-              :maxlength="120"
-              pattern="([A-Za-zÀ-ÖØ-öø-ÿ0-9\s\&\-\~]+){3,120}"
-              class="w-full -my-1 py-1 -mx-1 px-1 text-lg border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500"
+              name="new-event-location"
+              :placeholder="$t('entity.calendar.event.addLocation')"
+              :maxlength="160"
+              pattern="([A-Za-zÀ-ÖØ-öø-ÿ0-9\s\&\-\~]+){3,160}"
+              class="w-full -my-1 py-2 px-2 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600"
             >
-
             <div class="mt-2 mb-1 text-xs opacity-50">
-              {{ t('entity.calendar.event.patterns.title') }}
+              {{ t('entity.calendar.event.patterns.location') }}
             </div>
           </div>
-
-          <div class="col-span-2 my-2 pl-8">
-            <textarea
-              id="new-event-description"
-              v-model="eventSkeleton.description"
-              name="new-event-description"
-              :placeholder="$t('entity.addDescription')"
-              :maxlength="1200"
-              class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500"
-            />
-            <div class="mt-2 mb-1 text-xs opacity-50">
-              {{ t('entity.calendar.event.patterns.description') }}
-            </div>
-          </div>
-
-          <div class="col-span-2">
-            <div class="flex items-center gap-4">
-              <PhAlarm size="18" weight="fill" />
-
-              <CalendarInputRPGDate
-                v-model:model-value="eventSkeleton.startDate"
-                :placeholder="$t('entity.calendar.date.start')"
-                :initial-date="props.date"
-                :required="true"
-              />
-
-              <span>—</span>
-
-              <CalendarInputRPGDate
-                v-model:model-value="eventSkeleton.endDate"
-                :placeholder="$t('entity.calendar.date.end')"
-                :initial-date="props.date"
-              />
-            </div>
-          </div>
-
-          <div class="col-span-2">
-            <div class="flex items-center gap-4">
-              <PhTag size="18" weight="fill" />
-
-              <CalendarInputEventCategory
-                v-model="eventSkeleton.category"
-                :placeholder="$t('entity.category.addPrimary')"
-              />
-            </div>
-          </div>
-
-          <!-- <div class="col-span-2">
-            <div class="flex items-center gap-4">
-              <PhTag size="18" weight="fill" />
-
-              <CalendarInputEventCategories v-model="eventSkeleton.secondaryCategories" :placeholder="$t('entity.category.addSecondaries')" />
-            </div>
-          </div> -->
-
-          <div class="col-span-2 mb-2">
-            <div class="flex items-center gap-4">
-              <PhMapPinArea size="18" weight="fill" />
-
-              <div class="grow">
-                <input
-                  id="new-event-location"
-                  v-model="eventSkeleton.location"
-                  type="text"
-                  name="new-event-location"
-                  :placeholder="$t('entity.calendar.event.addLocation')"
-                  :maxlength="160"
-                  pattern="([A-Za-zÀ-ÖØ-öø-ÿ0-9\s\&\-\~]+){3,160}"
-                  class="w-full -my-1 py-2 px-2 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600"
-                >
-                <div class="mt-2 mb-1 text-xs opacity-50">
-                  {{ t('entity.calendar.event.patterns.location') }}
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <div class="col-span-2">
-            <div class="flex items-center gap-4">
-              <PhEye v-if="!eventSkeleton.hidden" size="18" weight="fill" />
-              <PhEyeClosed v-else size="18" />
-
-              <div class="flex items-center gap-x-2">
-                <UiSwitch id="new-event-visibility" v-model:checked="eventSkeleton.hidden" />
-                <UiLabel for="new-event-visibility">
-                  <template v-if="!eventSkeleton.hidden">
-                    {{ $t('entity.calendar.event.isPublic') }}
-                  </template>
-                  <template v-else>
-                    {{ $t('entity.calendar.event.isHidden') }}
-                  </template>
-                </UiLabel>
-              </div>
-            </div>
-          </div>
-
-          <div class="text-red-500 pl-8">
-            <span class="text-sm">
-              {{ formErrors.message }}
-            </span>
-          </div>
-
-          <div class="flex gap-2 justify-end">
-            <Transition name="fade-delay">
-              <UiButton v-if="isLoading" type="button" size="sm" variant="destructive" @click.prevent="handleCancel">
-                {{ $t('ui.action.cancel') }}
-              </UiButton>
-            </Transition>
-
-            <UiButton size="sm" :disabled="isLoading">
-              <Transition name="fade">
-                <PhCircleNotch v-if="isLoading" size="20" class="opacity-50 animate-spin"/>
-              </Transition>
-
-              {{ $t('ui.action.save') }}
-            </UiButton>
-          </div>
         </div>
-      </form>
-    </UiPopoverContent>
-  </UiPopover>
+      </div>
+
+      <div class="col-span-2">
+        <div class="flex items-center gap-4">
+          <PhEye v-if="!eventSkeleton.hidden" size="18" weight="fill" />
+          <PhEyeClosed v-else size="18" />
+
+          <div class="flex items-center gap-x-2">
+            <UiSwitch id="new-event-visibility" v-model:checked="eventSkeleton.hidden" />
+            <UiLabel for="new-event-visibility">
+              <template v-if="!eventSkeleton.hidden">
+                {{ $t('entity.calendar.event.isPublic') }}
+              </template>
+              <template v-else>
+                {{ $t('entity.calendar.event.isHidden') }}
+              </template>
+            </UiLabel>
+          </div>
+        </div>
+      </div>
+
+      <div class="text-red-500 pl-8">
+        <span class="text-sm">
+          {{ formErrors.message }}
+        </span>
+      </div>
+
+      <div class="flex gap-2 justify-end">
+        <Transition name="fade-delay">
+          <UiButton v-if="isLoading" type="button" size="sm" variant="destructive" @click.prevent="handleCancel">
+            {{ $t('ui.action.cancel') }}
+          </UiButton>
+        </Transition>
+
+        <UiButton size="sm" :disabled="isLoading">
+          <Transition name="fade">
+            <PhCircleNotch v-if="isLoading" size="20" class="opacity-50 animate-spin"/>
+          </Transition>
+
+          {{ $t('ui.action.save') }}
+        </UiButton>
+      </div>
+    </div>
+  </form>
 </template>
diff --git a/components/calendar/form/DeleteEvent.vue b/components/calendar/form/DeleteEvent.vue
index 065a4f5..f9e68f0 100644
--- a/components/calendar/form/DeleteEvent.vue
+++ b/components/calendar/form/DeleteEvent.vue
@@ -3,7 +3,7 @@ import { PhCircleNotch } from "@phosphor-icons/vue";
 import { useToast } from "~/components/ui/toast";
 
 const { resetSkeleton, deleteEventFromSkeleton, cancelLatestRequest } = useCalendar()
-const { isDeleteEventModalOpen, eventSkeleton, lastActiveEvent } = storeToRefs(useCalendar())
+const { isDeleteEventModalOpen, eventSkeleton } = storeToRefs(useCalendar())
 
 const { toast } = useToast()
 const { t } = useI18n()
@@ -14,13 +14,6 @@ const formErrors = reactive<{ message: string | null }>({
   message: null
 })
 
-// Watch the popover state
-watch(isDeleteEventModalOpen, (hasOpened, _o) => {
-  if (hasOpened && lastActiveEvent.value) {
-    eventSkeleton.value = { ...lastActiveEvent.value }
-  }
-})
-
 async function handleAction(): Promise<void> {
   if (isLoading.value) return
 
@@ -48,17 +41,6 @@ async function handleAction(): Promise<void> {
   }
 }
 
-/**
- * Prevents the modal from closing if's still loading
- *
- * @param e The closing event (can be keydown or click)
- */
-function handleClosing(e: Event): void {
-  if (isLoading.value) {
-    e.preventDefault()
-  }
-}
-
 /**
  * Click on the cancel button
  *
@@ -71,53 +53,35 @@ function handleCancel(): void {
 </script>
 
 <template>
-  <UiAlertDialog v-model:open="isDeleteEventModalOpen">
-    <UiAlertDialogContent
-      :disable-outside-pointer-events="true"
-      :trap-focus="true"
-      class="min-w-96 border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
-      @escape-key-down="handleClosing"
-      @focus-outside="handleClosing"
-      @interact-outside="handleClosing"
-      @pointer-down-outside="handleClosing"
-    >
-      <UiAlertDialogTitle>{{ $t('entity.calendar.event.deleteDialog.title') }}</UiAlertDialogTitle>
+  <form @submit.prevent="handleAction">
+    <div class="grid grid-cols-2 gap-y-4">
+      <div class="text-red-500 ml-8">
+        <span class="text-sm">
+          {{ formErrors.message }}
+        </span>
+      </div>
+    </div>
 
-      <UiAlertDialogDescription>
-        {{ $t('entity.calendar.event.deleteDialog.subtitle') }}
-      </UiAlertDialogDescription>
+    <footer class="flex gap-2 justify-between">
+      <UiButton type="button" size="sm" variant="outline" @click="() => isDeleteEventModalOpen = false">
+        {{ $t('ui.action.back') }}
+      </UiButton>
 
-      <form @submit.prevent="handleAction">
-        <div class="grid grid-cols-2 gap-y-4">
-          <div class="text-red-500 ml-8">
-            <span class="text-sm">
-              {{ formErrors.message }}
-            </span>
-          </div>
-        </div>
-
-        <footer class="flex gap-2 justify-between">
-          <UiButton type="button" size="sm" variant="outline" @click="() => isDeleteEventModalOpen = false">
-            {{ $t('ui.action.back') }}
+      <div class="flex gap-2 justify-end">
+        <Transition name="fade-delay">
+          <UiButton v-if="isLoading" type="button" size="sm" variant="destructive" @click.prevent="handleCancel">
+            {{ $t('ui.action.cancel') }}
           </UiButton>
+        </Transition>
 
-          <div class="flex gap-2 justify-end">
-            <Transition name="fade-delay">
-              <UiButton v-if="isLoading" type="button" size="sm" variant="destructive" @click.prevent="handleCancel">
-                {{ $t('ui.action.cancel') }}
-              </UiButton>
-            </Transition>
+        <UiButton size="sm" variant="destructive" :disabled="isLoading">
+          <Transition name="fade">
+            <PhCircleNotch v-if="isLoading" size="20" class="animate-spin"/>
+          </Transition>
 
-            <UiButton size="sm" variant="destructive" :disabled="isLoading">
-              <Transition name="fade">
-                <PhCircleNotch v-if="isLoading" size="20" class="animate-spin"/>
-              </Transition>
-
-              {{ $t('ui.action.delete') }}
-            </UiButton>
-          </div>
-        </footer>
-      </form>
-    </UiAlertDialogContent>
-  </UiAlertDialog>
+          {{ $t('ui.action.delete') }}
+        </UiButton>
+      </div>
+    </footer>
+  </form>
 </template>
diff --git a/components/calendar/form/UpdateEvent.vue b/components/calendar/form/UpdateEvent.vue
index 1f8615f..716cf4c 100644
--- a/components/calendar/form/UpdateEvent.vue
+++ b/components/calendar/form/UpdateEvent.vue
@@ -4,7 +4,7 @@ import { useToast } from "~/components/ui/toast";
 import type { APIError } from "~/models/Errors";
 
 const { resetSkeleton, updateEventFromSkeleton, cancelLatestRequest } = useCalendar()
-const { eventSkeleton, lastActiveEvent, isEditEventModalOpen } = storeToRefs(useCalendar())
+const { eventSkeleton, lastActiveEvent } = storeToRefs(useCalendar())
 
 const { toast } = useToast()
 const { t } = useI18n()
@@ -15,13 +15,6 @@ const formErrors = reactive<{ message: string | null }>({
   message: null
 })
 
-// Watch the popover state
-watch(isEditEventModalOpen, (hasOpened, _o) => {
-  if (hasOpened && lastActiveEvent.value) {
-    eventSkeleton.value = { ...lastActiveEvent.value }
-  }
-})
-
 async function handleAction() {
   if (isLoading.value) return
 
@@ -44,18 +37,6 @@ async function handleAction() {
   } finally {
     resetSkeleton()
     isLoading.value = false
-    isEditEventModalOpen.value = false
-  }
-}
-
-/**
- * Prevents the modal from closing if's still loading
- *
- * @param e The closing event (can be keydown or click)
- */
-function handleClosing(e: Event) {
-  if (isLoading.value) {
-    e.preventDefault()
   }
 }
 
@@ -71,174 +52,152 @@ function handleCancel() {
 </script>
 
 <template>
-  <UiDialog v-model:open="isEditEventModalOpen">
-    <UiDialogContent
-      :disable-outside-pointer-events="true"
-      :trap-focus="true"
-      class="pl-3 min-w-96 border-indigo-200 dark:bg-slate-950 dark:border-indigo-950"
-      @escape-key-down="handleClosing"
-      @focus-outside="handleClosing"
-      @interact-outside="handleClosing"
-      @pointer-down-outside="(e) => e.preventDefault()"
-    >
-      <header class="pl-8 grid gap-y-2">
-        <UiDialogTitle>
-          {{ $t('entity.calendar.event.editDialog.title') }}
-        </UiDialogTitle>
+  <form @submit.prevent="handleAction">
+    <div class="grid grid-cols-2 gap-y-3">
+      <div class="col-span-2">
+        <div class="flex items-center gap-4">
+          <PhPencilSimpleLine size="20" weight="fill" />
 
-        <UiDialogDescription>
-          {{ $t('entity.calendar.event.editDialog.subtitle') }}
-        </UiDialogDescription>
-      </header>
-
-      <form @submit.prevent="handleAction">
-        <div class="grid grid-cols-2 gap-y-3">
-          <div class="col-span-2">
-            <div class="flex items-center gap-4">
-              <PhPencilSimpleLine size="20" weight="fill" />
-
-              <div class="grow">
-                <input
-                  id="new-event-title"
-                  v-model="eventSkeleton.title"
-                  type="text"
-                  name="new-event-title"
-                  required
-                  :placeholder="$t('entity.calendar.event.title')"
-                  :minlength="3"
-                  :maxlength="120"
-                  class="w-full -my-1 py-1 -mx-1 px-1 text-lg border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500"
-                >
-                <div class="mt-2 mb-1 text-xs opacity-50">
-                  {{ t('entity.calendar.event.patterns.title') }}
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <div class="col-span-2 my-2 ml-8">
-            <textarea
-              id="new-event-description"
-              v-model="eventSkeleton.description"
-              name="new-event-description"
-              :placeholder="$t('entity.addDescription')"
-              :maxlength="1200"
-              class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500"
-            />
+          <div class="grow">
+            <input
+              id="new-event-title"
+              v-model="eventSkeleton.title"
+              type="text"
+              name="new-event-title"
+              required
+              :placeholder="$t('entity.calendar.event.title')"
+              :minlength="3"
+              :maxlength="120"
+              class="w-full -my-1 py-1 -mx-1 px-1 text-lg border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500"
+            >
             <div class="mt-2 mb-1 text-xs opacity-50">
-              {{ t('entity.calendar.event.patterns.description') }}
+              {{ t('entity.calendar.event.patterns.title') }}
             </div>
           </div>
-
-          <div class="col-span-2">
-            <div class="flex items-center gap-4">
-              <PhAlarm size="18" weight="fill" />
-
-              <CalendarInputRPGDate
-                v-model:model-value="eventSkeleton.startDate"
-                :placeholder="$t('entity.calendar.date.start')"
-                :initial-date="lastActiveEvent?.startDate"
-                :required="true"
-              />
-
-              <span>—</span>
-
-              <CalendarInputRPGDate
-                v-model:model-value="eventSkeleton.endDate"
-                :placeholder="$t('entity.calendar.date.end')"
-                :initial-date="lastActiveEvent?.endDate"
-              />
-            </div>
-          </div>
-
-          <div class="col-span-2">
-            <div class="flex items-center gap-4">
-              <PhTag size="18" weight="fill" />
-
-              <div class="w-1/2">
-                <CalendarInputEventCategory
-                  v-model="eventSkeleton.category"
-                  :placeholder="$t('entity.category.addPrimary')"
-                />
-              </div>
-            </div>
-          </div>
-
-          <!-- <div class="col-span-2">
-            <div class="flex items-center gap-4">
-              <PhTag size="18" weight="fill" />
-
-              <div class="w-1/2">
-                <CalendarInputEventCategories v-model="eventSkeleton.secondaryCategories" placeholder="Ajouter des catégories secondaires" />
-              </div>
-            </div>
-          </div> -->
-
-          <div class="col-span-2 mb-2">
-            <div class="flex items-center gap-4">
-              <PhMapPinArea size="18" weight="fill" />
-
-              <div class="grow">
-                <input
-                  id="new-event-location"
-                  v-model="eventSkeleton.location"
-                  type="text"
-                  name="new-event-location"
-                  :placeholder="$t('entity.calendar.event.addLocation')"
-                  :minlength="3"
-                  :maxlength="160"
-                  class="w-full -my-1 py-2 px-2 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500"
-                >
-
-                <div class="mt-2 mb-1 text-xs opacity-50">
-                  {{ t('entity.calendar.event.patterns.location') }}
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <div class="col-span-2">
-            <div class="flex items-center gap-4">
-              <PhEye v-if="!eventSkeleton.hidden" size="18" weight="fill" />
-              <PhEyeClosed v-else size="18" />
-
-              <div class="flex items-center gap-x-2">
-                <UiSwitch id="new-event-visibility" v-model:checked="eventSkeleton.hidden" />
-                <UiLabel for="new-event-visibility">
-                  <template v-if="!eventSkeleton.hidden">
-                    {{ $t('entity.calendar.event.isPublic') }}
-                  </template>
-                  <template v-else>
-                    {{ $t('entity.calendar.event.isHidden') }}
-                  </template>
-                </UiLabel>
-              </div>
-            </div>
-          </div>
-
-          <div class="text-red-500 ml-8">
-            <span class="text-sm">
-              {{ formErrors.message }}
-            </span>
-          </div>
         </div>
+      </div>
 
-        <footer class="flex gap-2 justify-end">
-          <Transition name="fade-delay">
-            <UiButton v-if="isLoading" type="button" size="sm" variant="destructive" @click.prevent="handleCancel">
-              {{ $t('ui.action.cancel') }}
-            </UiButton>
-          </Transition>
+      <div class="col-span-2 my-2 ml-8">
+        <textarea
+          id="new-event-description"
+          v-model="eventSkeleton.description"
+          name="new-event-description"
+          :placeholder="$t('entity.addDescription')"
+          :maxlength="1200"
+          class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500"
+        />
+        <div class="mt-2 mb-1 text-xs opacity-50">
+          {{ t('entity.calendar.event.patterns.description') }}
+        </div>
+      </div>
 
-          <UiButton size="sm" :disabled="isLoading">
-            <Transition name="fade">
-              <PhCircleNotch v-if="isLoading" size="20" class="animate-spin"/>
-            </Transition>
+      <div class="col-span-2">
+        <div class="flex items-center gap-4">
+          <PhAlarm size="18" weight="fill" />
 
-            {{ $t('ui.action.save') }}
-          </UiButton>
-        </footer>
-      </form>
-    </UiDialogContent>
-  </UiDialog>
+          <CalendarInputRPGDate
+            v-model:model-value="eventSkeleton.startDate"
+            :placeholder="$t('entity.calendar.date.start')"
+            :initial-date="lastActiveEvent?.startDate"
+            :required="true"
+          />
+
+          <span>—</span>
+
+          <CalendarInputRPGDate
+            v-model:model-value="eventSkeleton.endDate"
+            :placeholder="$t('entity.calendar.date.end')"
+            :initial-date="lastActiveEvent?.endDate"
+          />
+        </div>
+      </div>
+
+      <div class="col-span-2">
+        <div class="flex items-center gap-4">
+          <PhTag size="18" weight="fill" />
+
+          <div class="w-1/2">
+            <CalendarInputEventCategory
+              v-model="eventSkeleton.category"
+              :placeholder="$t('entity.category.addPrimary')"
+            />
+          </div>
+        </div>
+      </div>
+
+      <!-- <div class="col-span-2">
+        <div class="flex items-center gap-4">
+          <PhTag size="18" weight="fill" />
+
+          <div class="w-1/2">
+            <CalendarInputEventCategories v-model="eventSkeleton.secondaryCategories" placeholder="Ajouter des catégories secondaires" />
+          </div>
+        </div>
+      </div> -->
+
+      <div class="col-span-2 mb-2">
+        <div class="flex items-center gap-4">
+          <PhMapPinArea size="18" weight="fill" />
+
+          <div class="grow">
+            <input
+              id="new-event-location"
+              v-model="eventSkeleton.location"
+              type="text"
+              name="new-event-location"
+              :placeholder="$t('entity.calendar.event.addLocation')"
+              :minlength="3"
+              :maxlength="160"
+              class="w-full -my-1 py-2 px-2 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500"
+            >
+
+            <div class="mt-2 mb-1 text-xs opacity-50">
+              {{ t('entity.calendar.event.patterns.location') }}
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="col-span-2">
+        <div class="flex items-center gap-4">
+          <PhEye v-if="!eventSkeleton.hidden" size="18" weight="fill" />
+          <PhEyeClosed v-else size="18" />
+
+          <div class="flex items-center gap-x-2">
+            <UiSwitch id="new-event-visibility" v-model:checked="eventSkeleton.hidden" />
+            <UiLabel for="new-event-visibility">
+              <template v-if="!eventSkeleton.hidden">
+                {{ $t('entity.calendar.event.isPublic') }}
+              </template>
+              <template v-else>
+                {{ $t('entity.calendar.event.isHidden') }}
+              </template>
+            </UiLabel>
+          </div>
+        </div>
+      </div>
+
+      <div class="text-red-500 ml-8">
+        <span class="text-sm">
+          {{ formErrors.message }}
+        </span>
+      </div>
+    </div>
+
+    <footer class="flex gap-2 justify-end">
+      <Transition name="fade-delay">
+        <UiButton v-if="isLoading" type="button" size="sm" variant="destructive" @click.prevent="handleCancel">
+          {{ $t('ui.action.cancel') }}
+        </UiButton>
+      </Transition>
+
+      <UiButton size="sm" :disabled="isLoading">
+        <Transition name="fade">
+          <PhCircleNotch v-if="isLoading" size="20" class="animate-spin"/>
+        </Transition>
+
+        {{ $t('ui.action.save') }}
+      </UiButton>
+    </footer>
+  </form>
 </template>
diff --git a/components/calendar/state/monthly/DayTile.vue b/components/calendar/state/monthly/DayTile.vue
index 1973543..aee9bb2 100644
--- a/components/calendar/state/monthly/DayTile.vue
+++ b/components/calendar/state/monthly/DayTile.vue
@@ -143,7 +143,7 @@ const eventsNotDisplayed: ComputedRef<number>  = computed<number>(() => eventsFo
     </ClientOnly>
 
     <ClientOnly>
-      <LazyCalendarFormCreateEvent :date btn-class="absolute inset-0 w-full h-full cursor-default z-0" />
+      <LazyCalendarDialogCreateEvent :date btn-class="absolute inset-0 w-full h-full cursor-default z-0" />
     </ClientOnly>
   </div>
 </template>
diff --git a/i18n.config.ts b/i18n.config.ts
index 2955061..9fda9f1 100644
--- a/i18n.config.ts
+++ b/i18n.config.ts
@@ -127,6 +127,8 @@ export default defineI18nConfig(() => ({
           event: {
             nameSingular: "Event",
             namePlural: "Events",
+            addSingle: "Add an event",
+            newEvent: "New event",
             title: "Event title",
             isStart: "Start",
             isEnd: "End",
@@ -348,6 +350,8 @@ export default defineI18nConfig(() => ({
           event: {
             nameSingular: "Évènement",
             namePlural: "Évènements",
+            addSingle: "Ajouter un évènement",
+            newEvent: "Nouvel évènement",
             title: "Titre de l'évènement",
             isStart: "Début",
             isEnd: "Fin",