diff --git a/src/layouts/order-confirmation/add-to-calendar/add-to-calendar.vue b/src/layouts/order-confirmation/add-to-calendar/add-to-calendar.vue
index 0140bad4..284a34e6 100644
--- a/src/layouts/order-confirmation/add-to-calendar/add-to-calendar.vue
+++ b/src/layouts/order-confirmation/add-to-calendar/add-to-calendar.vue
@@ -214,7 +214,7 @@ export default {
         },
         calendarOptionSelected(calendarOptionIndex) {
             this.setCalendarAppointment(this.calendarValues[calendarOptionIndex]);
-            this.calendarOptionsOpen = false;
+            this.closeCalendarOptions();
         },
         getCalendarData(type) {
             let URL = '';
@@ -262,6 +262,9 @@ export default {
                 this.closeCalendarOptions();
             }
         }
+    },
+    unmounted() {
+        window.removeEventListener('click', this.clickListener);
     }
 };
 </script>
diff --git a/src/layouts/order-confirmation/add-to-calendar/calendar-option-selection/calendar-option-selection.vue b/src/layouts/order-confirmation/add-to-calendar/calendar-option-selection/calendar-option-selection.vue
index 2d9a2513..1c95c555 100644
--- a/src/layouts/order-confirmation/add-to-calendar/calendar-option-selection/calendar-option-selection.vue
+++ b/src/layouts/order-confirmation/add-to-calendar/calendar-option-selection/calendar-option-selection.vue
@@ -15,14 +15,13 @@
 </template>
 <script>
 import calendarOptionButton from './calendar-option-button/calendar-option-button.vue';
-// Validation for the modal button
 export default {
-    name: 'calendar-modal-question',
+    name: 'calendar-option-selection',
     components: {
         calendarOptionButton
     },
     props: {
-        calendarOptionsData: Object,
+        calendarOptionsData: Array,
         open: Boolean
     },
     emits: ['calendar-option-selected'],