diff --git a/src/components/Editor/FreeBusy/RoomAvailabilityList.vue b/src/components/Editor/FreeBusy/RoomAvailabilityList.vue
index e8b60e0a2..486912cf6 100644
--- a/src/components/Editor/FreeBusy/RoomAvailabilityList.vue
+++ b/src/components/Editor/FreeBusy/RoomAvailabilityList.vue
@@ -3,10 +3,9 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<NcDialog v-if="showDialog"
+	<NcDialog :show="showDialog"
 		size="large"
-		:name="t('calendar', 'Availability of rooms')"
-		@closing="handleClose">
+		:name="t('calendar', 'Availability of rooms')">
 		<div class="modal__content__header">
 			<h2>{{ t('calendar', 'Find a room') }}</h2>
 			<table>
@@ -78,11 +77,14 @@ export default {
 			type: Date,
 			required: true,
 		},
+		showDialog: {
+			type: Boolean,
+			default: true,
+		},
 	},
 	data() {
 		return {
 			showRoomAvailabilityModal: false,
-			showDialog: true,
 			selectedRooms: [],
 		}
 	},
@@ -108,11 +110,9 @@ export default {
 			this.selectedRooms = [room]
 			this.showRoomAvailabilityModal = true
 		},
-		handleClose() {
-			this.showDialog = false
-		},
 		closeFreeBusy() {
 			this.showRoomAvailabilityModal = false
+			this.$emit('update:showDialog', false)
 		},
 	},
 }
diff --git a/src/components/Editor/Resources/ResourceListSearch.vue b/src/components/Editor/Resources/ResourceListSearch.vue
index 600d7f32a..3db0e4e61 100644
--- a/src/components/Editor/Resources/ResourceListSearch.vue
+++ b/src/components/Editor/Resources/ResourceListSearch.vue
@@ -9,10 +9,11 @@
 			{{ t('calendar', 'Room availability') }}
 		</NcButton>
 
-		<RoomAvailabilityList v-if="showRoomAvailabilityModel"
+		<RoomAvailabilityList v-if="showRoomAvailabilityModal"
 			:calendar-object-instance="calendarObjectInstance"
 			:start-date="calendarObjectInstance.startDate"
-			:end-date="calendarObjectInstance.endDate" />
+			:end-date="calendarObjectInstance.endDate"
+			:show-dialog="showRoomAvailabilityModal" />
 		<NcSelect class="resource-search__multiselect"
 			:options="matches"
 			:searchable="true"
@@ -119,7 +120,7 @@ export default {
 			isAccessible: false,
 			hasProjector: false,
 			hasWhiteboard: false,
-			showRoomAvailabilityModel: false,
+			showRoomAvailabilityModal: false,
 			rooms: [],
 		}
 	},
@@ -147,7 +148,7 @@ export default {
 	},
 	methods: {
 		openRoomAvailability() {
-			this.showRoomAvailabilityModel = true
+			this.showRoomAvailabilityModal = true
 		},
 		findResources: debounce(async function(query) {
 			this.isLoading = true