diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
index fcc57f6d247..d7bd612c261 100644
--- a/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
+++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
@@ -21,8 +21,11 @@
 
 <template>
 	<NcModal v-bind="$attrs"
+		:container="$store.getters.getMainContainerSelector()"
+		:class="{'modal-mask__participants-step': isEditingParticipants}"
 		v-on="$listeners">
-		<div class="breakout-rooms-editor">
+		<div class="breakout-rooms-editor"
+			:class="{'breakout-rooms-editor__participants-step': isEditingParticipants}">
 			<h2>{{ modalTitle }}</h2>
 			<template v-if="!isEditingParticipants">
 				<div class="breakout-rooms-editor__main">
@@ -136,10 +139,15 @@ export default {
 	padding: 20px;
 	justify-content: flex-start;
 	align-items: flex-start;
-	height: calc(100% - 40px);
+
+	&__participants-step {
+		height: calc(100% - 40px);
+
+	}
+
 	&__main {
 		height: 100%;
-	 }
+	}
 
 	&__buttons {
 		display: flex;
@@ -149,8 +157,10 @@ export default {
 	}
 }
 
-::v-deep .modal-container {
-	overflow: hidden !important;
-	height: 100%;
+.modal-mask__participants-step {
+	::v-deep .modal-container {
+		overflow: hidden !important;
+		height: 100% !important;
+	}
 }
 </style>
diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
index 989e9b94a16..87bca808e7e 100644
--- a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
+++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
@@ -325,7 +325,7 @@ export default {
 	}
 }
 
-// TODO: upsteream collapse icon position fix
+// TODO: upstream collapse icon position fix
 ::v-deep .icon-collapse {
 	position: absolute !important;
 	left: 0;
diff --git a/src/components/TopBar/TopBarMenu.vue b/src/components/TopBar/TopBarMenu.vue
index 9b0751ae50e..a159789bcd3 100644
--- a/src/components/TopBar/TopBarMenu.vue
+++ b/src/components/TopBar/TopBarMenu.vue
@@ -369,9 +369,9 @@ export default {
 		},
 
 		canConfigureBreakoutRooms() {
-		  if (!this.conversation.type === CONVERSATION.TYPE.GROUP || !this.canFullModerate) {
-		    return false
-		  }
+			if (!this.conversation.type === CONVERSATION.TYPE.GROUP || !this.canFullModerate) {
+				return false
+			}
 
 			const breakoutRoomsEnabled = getCapabilities()?.spreed?.config?.call?.['breakout-rooms']
 			return !!breakoutRoomsEnabled