diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue
index dadb9c6..40663e4 100644
--- a/src/pages/calendar/components/CalendarColumn.vue
+++ b/src/pages/calendar/components/CalendarColumn.vue
@@ -15,8 +15,8 @@
     .body.pl-1
       transition-group(name="card")
         calendar-event-card(
-          v-for="event in dayEvents",
-          :key="event.id",
+          v-for="event, index in dayEvents",
+          :key="event.id + index",
           :id="event.id",
           :ownerEvent="event",
           :event-types="eventTypes",
@@ -25,7 +25,7 @@
           @selected-event="transmitEventData",
           @reset-change-form="transmitResetChangeForm",
           @delete-event="transmitDeleteEvent",
-          :schedule-body-ref="scheduleBodyRef"
+          :schedule-body-ref="scheduleBodyRef",
         )
 </template>
 
diff --git a/src/pages/calendar/components/CalendarEventCard.vue b/src/pages/calendar/components/CalendarEventCard.vue
index 81a534e..3185047 100644
--- a/src/pages/calendar/components/CalendarEventCard.vue
+++ b/src/pages/calendar/components/CalendarEventCard.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .wrapper.cursor-pointer.my-1.relative(
+  .wrapper.cursor-pointer.my-1(
     :style="themeColors",
     :class="cardTheme",
     ref="eventCard"
@@ -227,7 +227,7 @@ export default {
     changeFormWasClosed: {
       immediate: true,
       handler(newValue) {
-        if (newValue === true) {
+        if (newValue === true && this.isActive) {
           this.isActive = false;
           this.$emit("reset-change-form");
         }