diff --git a/src/collections.js b/src/collections.js
index 28c90820715..b9b51606430 100644
--- a/src/collections.js
+++ b/src/collections.js
@@ -14,12 +14,7 @@ __webpack_public_path__ = OC.linkTo('spreed', 'js/')
 
 window.OCP.Collaboration.registerType('room', {
 	action: async () => {
-		const conversation = await requestRoomSelection('spreed-room-select', {
-			// Even if it is used from Talk the Collections menu is
-			// independently loaded, so the properties that depend
-			// on the store need to be explicitly injected.
-			container: window.store ? window.store.getters.getMainContainerSelector() : undefined,
-		})
+		const conversation = await requestRoomSelection('spreed-room-select', {})
 		if (!conversation) {
 			throw new Error('User cancelled resource selection')
 		}
diff --git a/src/components/AdminSettings/BotsSettings.vue b/src/components/AdminSettings/BotsSettings.vue
index bad1840b6f8..15b48368210 100644
--- a/src/components/AdminSettings/BotsSettings.vue
+++ b/src/components/AdminSettings/BotsSettings.vue
@@ -48,7 +48,7 @@
 				</div>
 				<div :id="`last_error_bot_${bot.id}`" class="last-error">
 					<NcPopover v-if="bot.last_error_message"
-						:container="`#last_error_bot_${bot.id}`"
+						container="#bots_settings"
 						:focus-trap="false">
 						<template #trigger>
 							<NcButton type="error" :aria-label="bot.last_error_message">
diff --git a/src/components/AvatarWrapper/AvatarWrapper.spec.js b/src/components/AvatarWrapper/AvatarWrapper.spec.js
index cf4f6c5702b..a446b23a9b0 100644
--- a/src/components/AvatarWrapper/AvatarWrapper.spec.js
+++ b/src/components/AvatarWrapper/AvatarWrapper.spec.js
@@ -21,11 +21,9 @@ describe('AvatarWrapper.vue', () => {
 	const USER_ID = 'user-id'
 	const USER_NAME = 'John Doe'
 	const PRELOADED_USER_STATUS = { status: 'online', message: null, icon: null }
-	const MENU_CONTAINER = '#menu-container'
 
 	beforeEach(() => {
 		testStoreConfig = cloneDeep(storeConfig)
-		testStoreConfig.modules.uiModeStore.getters.getMainContainerSelector = jest.fn().mockReturnValue(() => MENU_CONTAINER)
 		store = new Vuex.Store(testStoreConfig)
 	})
 
@@ -86,7 +84,6 @@ describe('AvatarWrapper.vue', () => {
 
 			expect(avatar.props('user')).toBe(USER_ID)
 			expect(avatar.props('displayName')).toBe(USER_NAME)
-			expect(avatar.props('menuContainer')).toBe(MENU_CONTAINER)
 			expect(avatar.props('showUserStatus')).toBe(true)
 			expect(avatar.props('showUserStatusCompact')).toBe(false)
 			expect(avatar.props('preloadedUserStatus')).toBe(PRELOADED_USER_STATUS)
diff --git a/src/components/AvatarWrapper/AvatarWrapper.vue b/src/components/AvatarWrapper/AvatarWrapper.vue
index 80909f1d10b..f098a1fcb36 100644
--- a/src/components/AvatarWrapper/AvatarWrapper.vue
+++ b/src/components/AvatarWrapper/AvatarWrapper.vue
@@ -23,7 +23,7 @@
 			:key="id + (isDarkTheme ? '-dark' : '-light')"
 			:user="id"
 			:display-name="name"
-			:menu-container="menuContainerWithFallback"
+			:menu-container="menuContainer"
 			:disable-tooltip="disableTooltip"
 			:disable-menu="disableMenu"
 			:show-user-status="showUserStatus"
@@ -201,9 +201,6 @@ export default {
 			const customName = this.name?.trim() && this.name !== t('spreed', 'Guest') ? this.name : '?'
 			return customName.charAt(0)
 		},
-		menuContainerWithFallback() {
-			return this.menuContainer ?? this.$store.getters.getMainContainerSelector()
-		},
 		avatarUrl() {
 			return getUserProxyAvatarOcsUrl(this.token, this.id, this.isDarkTheme, this.size > AVATAR.SIZE.MEDIUM ? 512 : 64)
 		},
diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
index 0329a7f9240..085c9164dcc 100644
--- a/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
+++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
@@ -4,8 +4,7 @@
 -->
 
 <template>
-	<NcModal :container="container"
-		:class="{'modal-mask__participants-step': isEditingParticipants}"
+	<NcModal :class="{'modal-mask__participants-step': isEditingParticipants}"
 		:label-id="dialogHeaderId"
 		v-on="$listeners">
 		<div class="breakout-rooms-editor"
@@ -130,10 +129,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		modalTitle() {
 			return this.isEditingParticipants
 				? t('spreed', 'Assign participants to rooms')
diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
index 2050f96235c..5122a6a2370 100644
--- a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
+++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
@@ -163,10 +163,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		participants() {
 			return this.$store.getters.participantsList(this.token).filter(participant => {
 				return (participant.participantType === PARTICIPANT.TYPE.USER
diff --git a/src/components/BreakoutRoomsEditor/SendMessageDialog.vue b/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
index 3256a0ead3b..bca61cbeee9 100644
--- a/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
+++ b/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
@@ -6,14 +6,11 @@
 <template>
 	<NcDialog ref="dialog"
 		:name="dialogTitle"
-		:container="container"
 		close-on-click-outside
 		size="normal"
 		v-on="$listeners"
 		@update:open="$emit('close')">
-		<NewMessage v-if="modalContainerId"
-			:key="modalContainerId"
-			ref="newMessage"
+		<NewMessage ref="newMessage"
 			role="region"
 			class="send-message-dialog"
 			:token="token"
@@ -78,10 +75,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		dialogTitle() {
 			return this.broadcast
 				? t('spreed', 'Send a message to all breakout rooms')
diff --git a/src/components/ChatView.vue b/src/components/ChatView.vue
index 72b91b80d85..8532fc8f93c 100644
--- a/src/components/ChatView.vue
+++ b/src/components/ChatView.vue
@@ -46,11 +46,8 @@
 		</div>
 
 		<!-- Input field -->
-		<NewMessage v-if="containerId"
-			:key="containerId"
-			role="region"
+		<NewMessage role="region"
 			:token="token"
-			:container="containerId"
 			has-typing-indicator
 			:aria-label="t('spreed', 'Post message')" />
 
@@ -113,7 +110,6 @@ export default {
 		return {
 			isChatScrolledToBottom: true,
 			isDraggingOver: false,
-			containerId: undefined,
 		}
 	},
 
@@ -163,26 +159,11 @@ export default {
 			return this.$store.getters.conversation(this.token)
 		},
 
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		isLoadingChat() {
 			return !this.$store.getters.isMessagesListPopulated(this.token)
 		},
 	},
 
-	watch: {
-		container(value) {
-			this.containerId = value
-		},
-	},
-
-	mounted() {
-		// Postpone render of NewMessage until application is mounted
-		this.containerId = this.container
-	},
-
 	methods: {
 		t,
 
diff --git a/src/components/ConversationIcon.vue b/src/components/ConversationIcon.vue
index bd61da75aa1..aaf11831c17 100644
--- a/src/components/ConversationIcon.vue
+++ b/src/components/ConversationIcon.vue
@@ -39,7 +39,6 @@
 			:preloaded-user-status="preloadedUserStatus"
 			:show-user-status="!hideUserStatus"
 			:show-user-status-compact="!showUserOnlineStatus"
-			:menu-container="menuContainer"
 			class="conversation-icon__avatar" />
 		<div v-if="showCall" class="overlap-icon">
 			<VideoIcon :size="20" :fill-color="'#E9322D'" />
@@ -159,12 +158,6 @@ export default {
 			return getPreloadedUserStatus(this.item)
 		},
 
-		menuContainer() {
-			// The store may not be defined in the RoomSelector if used from
-			// the Collaboration menu outside Talk.
-			return this.$store?.getters.getMainContainerSelector()
-		},
-
 		iconClass() {
 			if (this.item.isDummyConversation) {
 				// Prevent a 404 when trying to load an avatar before the conversation data is actually loaded
diff --git a/src/components/ConversationSettings/ConversationSettingsDialog.vue b/src/components/ConversationSettings/ConversationSettingsDialog.vue
index f978795a02f..07e1498d75a 100644
--- a/src/components/ConversationSettings/ConversationSettingsDialog.vue
+++ b/src/components/ConversationSettings/ConversationSettingsDialog.vue
@@ -8,8 +8,7 @@
 		:aria-label="t('spreed', 'Conversation settings')"
 		:name="t('spreed', 'Conversation settings')"
 		:open.sync="showSettings"
-		:show-navigation="true"
-		:container="container">
+		show-navigation>
 		<NcAppSettingsSection id="basic-info"
 			:name="t('spreed', 'Basic Info')">
 			<BasicInfo :conversation="conversation"
@@ -161,10 +160,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		canUserEnableSIP() {
 			return this.conversation.canEnableSIP
 		},
diff --git a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
index 452f144d843..a95c4dba20d 100644
--- a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
+++ b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
@@ -533,9 +533,6 @@ export default {
 						? t('spreed', 'not running, check Matterbridge log')
 						: t('spreed', 'not running')
 		},
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
 	},
 
 	beforeMount() {
diff --git a/src/components/GuestWelcomeWindow.vue b/src/components/GuestWelcomeWindow.vue
index 3207e9c24bf..4c13d393937 100644
--- a/src/components/GuestWelcomeWindow.vue
+++ b/src/components/GuestWelcomeWindow.vue
@@ -4,8 +4,7 @@
 -->
 
 <template>
-	<NcModal :container="container"
-		:can-close="false"
+	<NcModal :can-close="false"
 		:close-on-click-outside="false"
 		:label-id="dialogHeaderId"
 		size="small">
@@ -100,10 +99,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		conversation() {
 			return this.$store.getters.conversation(this.token)
 		},
diff --git a/src/components/LeftSidebar/CallPhoneDialog/CallPhoneDialog.vue b/src/components/LeftSidebar/CallPhoneDialog/CallPhoneDialog.vue
index ac9adf11d39..46a353a4efa 100644
--- a/src/components/LeftSidebar/CallPhoneDialog/CallPhoneDialog.vue
+++ b/src/components/LeftSidebar/CallPhoneDialog/CallPhoneDialog.vue
@@ -7,7 +7,6 @@
 	<NcDialog :open="modal"
 		:name="t('spreed', 'Call a phone number')"
 		class="call-phone"
-		:container="container"
 		size="normal"
 		close-on-click-outside
 		@update:open="closeModal">
@@ -81,12 +80,6 @@ export default {
 		}
 	},
 
-	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-	},
-
 	expose: ['showModal'],
 
 	watch: {
diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
index 0e99b234c96..b87ab7fac08 100644
--- a/src/components/LeftSidebar/ConversationsList/Conversation.vue
+++ b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -99,8 +99,7 @@
 		<template v-if="isDialogOpen" #extra>
 			<NcDialog :open.sync="isDialogOpen"
 				:name="t('spreed','Delete conversation')"
-				:message="dialogMessage"
-				:container="container">
+				:message="dialogMessage">
 				<template #actions>
 					<NcButton type="tertiary" @click="isDialogOpen = false">
 						{{ t('spreed', 'No') }}
@@ -209,10 +208,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		canFavorite() {
 			return this.item.participantType !== PARTICIPANT.TYPE.USER_SELF_JOINED
 		},
diff --git a/src/components/LeftSidebar/InvitationHandler.vue b/src/components/LeftSidebar/InvitationHandler.vue
index 8cdbb68dd87..38d90566a24 100644
--- a/src/components/LeftSidebar/InvitationHandler.vue
+++ b/src/components/LeftSidebar/InvitationHandler.vue
@@ -6,7 +6,6 @@
 <template>
 	<NcDialog :open.sync="modal"
 		:name="t('spreed', 'Pending invitations')"
-		:container="container"
 		size="normal"
 		close-on-click-outside>
 		<div class="inbox">
@@ -115,10 +114,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		invitations() {
 			const invitations = {}
 			for (const id in this.federationStore.pendingShares) {
diff --git a/src/components/LeftSidebar/OpenConversationsList/OpenConversationsList.vue b/src/components/LeftSidebar/OpenConversationsList/OpenConversationsList.vue
index f1a2eabc7a9..1aa7185594f 100644
--- a/src/components/LeftSidebar/OpenConversationsList/OpenConversationsList.vue
+++ b/src/components/LeftSidebar/OpenConversationsList/OpenConversationsList.vue
@@ -5,7 +5,6 @@
 
 <template>
 	<RoomSelector v-if="modal"
-		:container="container"
 		list-open-conversations
 		show-postable-only
 		:dialog-title="dialogTitle"
@@ -39,10 +38,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		dialogTitle() {
 			return t('spreed', 'Join open conversations')
 		},
diff --git a/src/components/MediaSettings/MediaSettings.vue b/src/components/MediaSettings/MediaSettings.vue
index fa2ea4a8e90..659ae015791 100644
--- a/src/components/MediaSettings/MediaSettings.vue
+++ b/src/components/MediaSettings/MediaSettings.vue
@@ -5,7 +5,6 @@
 
 <template>
 	<NcModal v-if="modal"
-		:container="container"
 		:label-id="dialogHeaderId"
 		@close="closeModal">
 		<div class="media-settings">
@@ -137,7 +136,7 @@
 			<!-- buttons bar at the bottom -->
 			<div class="media-settings__call-buttons">
 				<!-- Silent call -->
-				<NcActions v-if="showSilentCallOption" :container="container" force-menu>
+				<NcActions v-if="showSilentCallOption" force-menu>
 					<NcActionButton v-if="!silentCall"
 						:name="t('spreed', 'Call without notification')"
 						close-after-click
@@ -331,10 +330,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		displayName() {
 			return this.$store.getters.getDisplayName()
 		},
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index 4bf5b07e18e..1e11bb24ae1 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -27,7 +27,6 @@
 			</NcButton>
 			<NcActions :force-menu="true"
 				placement="bottom-end"
-				:container="messageContainer"
 				:boundaries-element="boundariesElement"
 				@open="onMenuOpen"
 				@close="onMenuClose">
@@ -230,8 +229,7 @@
 				</template>
 			</NcButton>
 
-			<NcEmojiPicker :container="mainContainer"
-				:boundary="boundariesElement"
+			<NcEmojiPicker :boundary="boundariesElement"
 				placement="auto"
 				@select="handleReactionClick"
 				@after-show="onEmojiPickerOpen"
@@ -427,14 +425,6 @@ export default {
 			return this.$store.getters.conversation(this.message.token)
 		},
 
-		mainContainer() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
-		messageContainer() {
-			return `#message_${this.message.id}`
-		},
-
 		boundariesElement() {
 			return this.getMessagesListScroller()
 		},
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageForwarder.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageForwarder.vue
index d4fa2f7bb54..a7b361ce189 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageForwarder.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageForwarder.vue
@@ -8,7 +8,6 @@
 		<!-- First step of the flow: selection of the room to which forward the
 		message to -->
 		<RoomSelector v-if="!showForwardedConfirmation"
-			:container="container"
 			show-postable-only
 			:dialog-title="dialogTitle"
 			:dialog-subtitle="dialogSubtitle"
@@ -20,7 +19,6 @@
 		message has been forwarded -->
 		<NcDialog v-else
 			:name="dialogTitle"
-			:container="container"
 			close-on-click-outside
 			@update:open="handleClose">
 			<NcEmptyContent :description="t('spreed', 'The message has been forwarded to {selectedConversationName}', { selectedConversationName })">
@@ -96,10 +94,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		dialogTitle() {
 			return t('spreed', 'Forward message')
 		},
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageTranslateDialog.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageTranslateDialog.vue
index a23275da93c..f642f3a9194 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageTranslateDialog.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageTranslateDialog.vue
@@ -8,7 +8,6 @@
 		class="translate-dialog"
 		:name="t('spreed', 'Translate message')"
 		size="large"
-		:container="container"
 		close-on-click-outside
 		@update:open="$emit('close')">
 		<template v-if="isMounted" #default>
@@ -119,10 +118,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		userLanguage() {
 			return navigator.language.substring(0, 2)
 		},
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Reactions.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Reactions.vue
index 0178db10948..64e4c8f798b 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Reactions.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Reactions.vue
@@ -52,7 +52,6 @@
 		<!-- More reactions picker -->
 		<NcEmojiPicker v-if="canReact && showControls"
 			:per-line="5"
-			:container="`#message_${id}`"
 			@select="handleReactionClick"
 			@after-show="emitEmojiPickerStatus"
 			@after-hide="emitEmojiPickerStatus">
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/ReactionsList.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/ReactionsList.vue
index c19bd441c0b..6ecfc0ce387 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/ReactionsList.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/ReactionsList.vue
@@ -5,7 +5,6 @@
 
 <template>
 	<NcDialog :name="t('spreed', 'Reactions')"
-		:container="container"
 		close-on-click-outside
 		@update:open="closeModal">
 		<div class="reactions__modal">
@@ -104,10 +103,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		reactionsOverview() {
 			const mergedReactionsMap = {}
 			const modifiedDetailedReactions = {}
diff --git a/src/components/NewConversationDialog/NewConversationDialog.vue b/src/components/NewConversationDialog/NewConversationDialog.vue
index c9b89072651..3d9d880200e 100644
--- a/src/components/NewConversationDialog/NewConversationDialog.vue
+++ b/src/components/NewConversationDialog/NewConversationDialog.vue
@@ -9,7 +9,6 @@
 		<NcModal v-show="page !== 2"
 			class="new-group-conversation"
 			:close-on-click-outside="!isFilled"
-			:container="container"
 			:label-id="dialogHeaderPrepId"
 			@close="closeModal">
 			<h2 :id="dialogHeaderPrepId" class="new-group-conversation__header nc-dialog-alike-header">
@@ -69,7 +68,6 @@
 
 		<!-- Third page : this is the confirmation page-->
 		<NcModal v-if="page === 2"
-			:container="container"
 			:label-id="dialogHeaderResId"
 			@close="closeModal">
 			<NcEmptyContent>
@@ -192,10 +190,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		isPublic() {
 			return this.newConversation.type === CONVERSATION.TYPE.PUBLIC
 		},
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index eb0b83db8b3..1bb94893d41 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -23,8 +23,6 @@
 			<!-- Attachments menu -->
 			<NewMessageAttachments v-if="showAttachmentsMenu"
 				:token="token"
-				:container="container"
-				:boundaries-element="containerElement"
 				:disabled="disabled"
 				:can-upload-files="canUploadFiles"
 				:can-share-files="canShareFiles"
@@ -42,7 +40,6 @@
 
 				<div class="new-message-form__emoji-picker">
 					<NcEmojiPicker v-if="!disabled"
-						:container="container"
 						:close-on-select="false"
 						@select="addEmoji">
 						<NcButton :disabled="disabled"
@@ -74,6 +71,7 @@
 					type="warning"
 					:text="t('spreed','Adding a mention will only notify users who did not read the message.')" />
 				<NcRichContenteditable ref="richContenteditable"
+					:key="container"
 					:value.sync="text"
 					:auto-complete="autoComplete"
 					:disabled="disabled"
@@ -120,7 +118,7 @@
 
 			<!-- Send buttons -->
 			<template v-else>
-				<NcActions v-if="!broadcast" :container="container" force-menu>
+				<NcActions v-if="!broadcast" force-menu>
 					<template #icon>
 						<BellOffIcon v-if="silentChat" :size="16" />
 					</template>
@@ -156,13 +154,11 @@
 		<!-- New file creation dialog -->
 		<NewMessageNewFileDialog v-if="showNewFileDialog !== -1"
 			:token="token"
-			:container="container"
 			:show-new-file-dialog="showNewFileDialog"
 			@dismiss="showNewFileDialog = -1" />
 
 		<FilePickerVue v-if="showFilePicker"
 			:name="t('spreed', 'File to share')"
-			:container="container"
 			:buttons="filePickerButtons"
 			allow-pick-directory
 			@close="showFilePicker = false" />
@@ -251,11 +247,10 @@ export default {
 
 		/**
 		 * Selector for popovers and pickers to be rendered inside container properly.
-		 * Container must be mounted before passing its ID as a prop
 		 */
 		container: {
 			type: String,
-			required: true,
+			default: undefined,
 		},
 
 		/**
diff --git a/src/components/NewMessage/NewMessageAttachments.vue b/src/components/NewMessage/NewMessageAttachments.vue
index 1e5b543e009..401096014fa 100644
--- a/src/components/NewMessage/NewMessageAttachments.vue
+++ b/src/components/NewMessage/NewMessageAttachments.vue
@@ -5,8 +5,6 @@
 
 <template>
 	<NcActions ref="attachmentsMenu"
-		:container="container"
-		:boundaries-element="boundariesElement"
 		:disabled="disabled"
 		:force-menu="true"
 		:aria-label="t('spreed', 'Share files to the conversation')"
@@ -100,16 +98,6 @@ export default {
 			required: true,
 		},
 
-		container: {
-			type: String,
-			required: true,
-		},
-
-		boundariesElement: {
-			type: Element,
-			required: true,
-		},
-
 		disabled: {
 			type: Boolean,
 			required: true,
diff --git a/src/components/NewMessage/NewMessageNewFileDialog.vue b/src/components/NewMessage/NewMessageNewFileDialog.vue
index 74be79003df..561838128a6 100644
--- a/src/components/NewMessage/NewMessageNewFileDialog.vue
+++ b/src/components/NewMessage/NewMessageNewFileDialog.vue
@@ -6,7 +6,6 @@
 <template>
 	<NcDialog :name="t('spreed', 'Create and share a new file')"
 		size="large"
-		:container="container"
 		class="templates-picker"
 		close-on-click-outside
 		@update:open="closeModal">
@@ -81,11 +80,6 @@ export default {
 			required: true,
 		},
 
-		container: {
-			type: String,
-			required: true,
-		},
-
 		showNewFileDialog: {
 			type: Number,
 			required: true,
diff --git a/src/components/NewMessage/NewMessagePollEditor.vue b/src/components/NewMessage/NewMessagePollEditor.vue
index de8c083313d..a65e22a10be 100644
--- a/src/components/NewMessage/NewMessagePollEditor.vue
+++ b/src/components/NewMessage/NewMessagePollEditor.vue
@@ -6,7 +6,6 @@
 <template>
 	<NcDialog :name="t('spreed', 'Create new poll')"
 		:close-on-click-outside="!isFilled"
-		:container="container"
 		v-on="$listeners"
 		@update:open="dismissEditor">
 		<!-- Poll Question -->
@@ -118,10 +117,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		isFilled() {
 			return !!this.pollQuestion || this.pollOptions.some(option => option)
 		},
diff --git a/src/components/NewMessage/NewMessageUploadEditor.vue b/src/components/NewMessage/NewMessageUploadEditor.vue
index 3c1e7154688..1f0ca98c472 100644
--- a/src/components/NewMessage/NewMessageUploadEditor.vue
+++ b/src/components/NewMessage/NewMessageUploadEditor.vue
@@ -8,7 +8,6 @@
 		ref="modal"
 		:size="isVoiceMessage ? 'small' : 'normal'"
 		:close-on-click-outside="false"
-		:container="container"
 		:label-id="dialogHeaderId"
 		@close="handleDismiss">
 		<div class="upload-editor"
@@ -62,8 +61,7 @@
 					{{ t('spreed', 'Send') }}
 				</NcButton>
 			</div>
-			<NewMessage v-else-if="modalContainerId"
-				:key="modalContainerId"
+			<NewMessage v-else
 				ref="newMessage"
 				role="region"
 				class="upload-editor__textfield"
@@ -142,10 +140,6 @@ export default {
 			return !!this.currentUploadId
 		},
 
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		addMoreAriaLabel() {
 			return t('spreed', 'Add more files')
 		},
@@ -181,10 +175,9 @@ export default {
 		async showModal(show) {
 			if (show) {
 				// Wait for modal content to be rendered
-				await this.getContainerId()
+				await this.$nextTick()
+				this.modalContainerId = `#modal-description-${this.$refs.modal.randId}`
 				if (this.supportMediaCaption) {
-					// Wait for NewMessage to be rendered after containerId is set
-					await this.$nextTick()
 					this.$refs.newMessage.focusInput()
 				} else {
 					this.$refs.submitButton.$el.focus()
@@ -195,11 +188,6 @@ export default {
 
 	methods: {
 		t,
-		async getContainerId() {
-			await this.$nextTick()
-			// Postpone render of NewMessage until modal container is mounted
-			this.modalContainerId = `#modal-description-${this.$refs.modal.randId}`
-		},
 
 		handleDismiss() {
 			this.$store.dispatch('discardUpload', this.currentUploadId)
diff --git a/src/components/PermissionsEditor/PermissionsEditor.vue b/src/components/PermissionsEditor/PermissionsEditor.vue
index 166064f763e..7001c3118a3 100644
--- a/src/components/PermissionsEditor/PermissionsEditor.vue
+++ b/src/components/PermissionsEditor/PermissionsEditor.vue
@@ -5,7 +5,7 @@
 
 <template>
 	<NcModal size="small"
-		:container="container"
+		:container="nestedContainer"
 		:label-id="dialogHeaderId"
 		v-on="$listeners">
 		<div class="wrapper">
@@ -101,7 +101,7 @@ export default {
 
 		nestedContainer: {
 			type: String,
-			default: null,
+			default: undefined,
 		},
 
 		/**
@@ -151,10 +151,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.nestedContainer ?? this.$store.getters.getMainContainerSelector()
-		},
-
 		modalTitle() {
 			if (this.displayName) {
 				return t('spreed', 'In this conversation <strong>{user}</strong> can:', {
diff --git a/src/components/PollViewer/PollViewer.vue b/src/components/PollViewer/PollViewer.vue
index 885d0f1d8b9..5e978013c99 100644
--- a/src/components/PollViewer/PollViewer.vue
+++ b/src/components/PollViewer/PollViewer.vue
@@ -6,7 +6,6 @@
 <template>
 	<NcModal v-if="id"
 		size="small"
-		:container="container"
 		:label-id="dialogHeaderId"
 		@close="dismissModal">
 		<div v-if="poll" class="poll-modal">
@@ -47,7 +46,6 @@
 						class="results__option__details">
 						<PollVotersDetails v-if="poll.details"
 							:token="token"
-							:container="container"
 							:details="getFilteredDetails(index)" />
 						<p v-if="selfHasVotedOption(index)" class="results__option-subtitle">
 							{{ t('spreed', 'You voted for this option') }}
@@ -74,9 +72,7 @@
 					{{ t('spreed', 'Change your vote') }}
 				</NcButton>
 				<!-- End poll button-->
-				<NcActions v-if="canEndPoll"
-					force-menu
-					:container="container">
+				<NcActions v-if="canEndPoll" force-menu>
 					<NcActionButton class="critical" @click="endPoll">
 						{{ t('spreed', 'End poll') }}
 						<template #icon>
@@ -164,10 +160,6 @@ export default {
 			return this.activePoll?.token
 		},
 
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		poll() {
 			return this.pollsStore.getPoll(this.token, this.id)
 		},
diff --git a/src/components/PollViewer/PollVotersDetails.vue b/src/components/PollViewer/PollVotersDetails.vue
index 98d53029401..6dc27ff54fe 100644
--- a/src/components/PollViewer/PollVotersDetails.vue
+++ b/src/components/PollViewer/PollVotersDetails.vue
@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<NcPopover class="poll-voters-details" trigger="hover" :container="container">
+	<NcPopover class="poll-voters-details" trigger="hover">
 		<template #trigger>
 			<NcButton type="tertiary-no-background"
 				:aria-label="t('spreed','Voted participants')"
@@ -71,11 +71,6 @@ export default {
 			type: Array,
 			required: true,
 		},
-
-		container: {
-			type: String,
-			required: true,
-		},
 	},
 
 	setup() {
diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
index 31313ac1853..5142c19840c 100644
--- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
+++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
@@ -28,7 +28,6 @@
 					{{ t('spreed', 'Join') }}
 				</NcButton>
 				<NcActions v-if="canModerate"
-					:container="container"
 					:inline="showAssistanceButton ? 1 : 0"
 					:force-menu="!showAssistanceButton">
 					<NcActionButton v-if="showAssistanceButton"
@@ -138,10 +137,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		participantType() {
 			return this.breakoutRoom?.participantType
 		},
diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue
index 0eccd805fa8..60509bae0f8 100644
--- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue
+++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue
@@ -66,9 +66,7 @@
 				</template>
 				{{ backToBreakoutRoomLabel }}
 			</NcButton>
-			<NcActions v-if="canModerate"
-				class="right"
-				:container="container">
+			<NcActions v-if="canModerate" class="right">
 				<NcActionButton v-if="canModerate && isInBreakoutRoom"
 					:aria-label="sendMessageLabel"
 					@click="openSendMessageDialog">
@@ -90,7 +88,6 @@
 
 		<!-- Participants editor -->
 		<NcModal v-if="showParticipantsEditor"
-			:container="container"
 			:label-id="dialogHeaderId"
 			@close="closeParticipantsEditor">
 			<div class="breakout-rooms-actions__editor">
@@ -218,10 +215,6 @@ export default {
 			return this.mainToken !== this.$store.getters.getToken()
 		},
 
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		manageBreakoutRoomsTitle() {
 			return t('spreed', 'Manage breakout rooms')
 		},
diff --git a/src/components/RightSidebar/Participants/Participant.vue b/src/components/RightSidebar/Participants/Participant.vue
index dc3e0cc30c5..32a55288d50 100644
--- a/src/components/RightSidebar/Participants/Participant.vue
+++ b/src/components/RightSidebar/Participants/Participant.vue
@@ -276,8 +276,7 @@
 			<!-- Confirmation required to remove participant -->
 			<NcDialog v-if="isRemoveDialogOpen"
 				:open.sync="isRemoveDialogOpen"
-				:name="removeParticipantLabel"
-				:container="container">
+				:name="removeParticipantLabel">
 				<p> {{ removeDialogMessage }} </p>
 				<template v-if="showBanOption">
 					<NcCheckboxRadioSwitch :checked.sync="isBanParticipant">
@@ -434,10 +433,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		participantNavigationId() {
 			return this.participant.actorType + '_' + this.participant.actorId
 		},
diff --git a/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue b/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue
index 31de45bc2ea..ae38bb6667f 100644
--- a/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue
+++ b/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue
@@ -5,7 +5,6 @@
 
 <template>
 	<NcModal size="large"
-		:container="container"
 		:label-id="dialogHeaderId"
 		v-on="$listeners">
 		<div class="shared-items-browser">
@@ -97,10 +96,6 @@ export default {
 		scroller() {
 			return this.$refs.scroller
 		},
-
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
 	},
 
 	watch: {
diff --git a/src/components/RoomSelector.vue b/src/components/RoomSelector.vue
index 0b88ac86026..aa1d4186e2c 100644
--- a/src/components/RoomSelector.vue
+++ b/src/components/RoomSelector.vue
@@ -5,7 +5,6 @@
 
 <template>
 	<NcDialog :name="dialogTitle"
-		:container="container"
 		close-on-click-outside
 		@update:open="close">
 		<template #default>
@@ -80,11 +79,6 @@ export default {
 	},
 
 	props: {
-		container: {
-			type: String,
-			default: undefined,
-		},
-
 		dialogTitle: {
 			type: String,
 			default: t('spreed', 'Link to a conversation'),
diff --git a/src/components/SettingsDialog/SettingsDialog.vue b/src/components/SettingsDialog/SettingsDialog.vue
index 387fb6c7974..b7c631d73e4 100644
--- a/src/components/SettingsDialog/SettingsDialog.vue
+++ b/src/components/SettingsDialog/SettingsDialog.vue
@@ -6,8 +6,7 @@
 <template>
 	<NcAppSettingsDialog :open.sync="showSettings"
 		:name="t('spreed', 'Talk settings')"
-		:show-navigation="true"
-		:container="container">
+		show-navigation>
 		<!-- Custom settings sections registered via OCA.Talk.Settings -->
 		<NcAppSettingsSection v-for="{ id, name, element } in customSettingsSections"
 			:id="id"
@@ -237,10 +236,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		playSounds() {
 			return this.$store.getters.playSounds
 		},
diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue
index a5d1d3bde02..74a0033521a 100644
--- a/src/components/TopBar/CallButton.vue
+++ b/src/components/TopBar/CallButton.vue
@@ -58,7 +58,6 @@
 			:aria-label="leaveCallCombinedLabel"
 			:menu-name="showButtonText ? leaveCallCombinedLabel : undefined"
 			force-name
-			:container="container"
 			:type="isScreensharing ? 'tertiary' : 'error'">
 			<template #icon>
 				<IconPhoneHangup v-if="!isBreakoutRoom" :size="20" />
@@ -217,9 +216,6 @@ export default {
 			return this.talkHashStore.isNextcloudTalkHashDirty
 				|| this.talkHashStore.isNextcloudTalkProxyHashDirty[this.token]
 		},
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
 		conversation() {
 			return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation
 		},
diff --git a/src/components/TopBar/CallTime.vue b/src/components/TopBar/CallTime.vue
index cd47b5d21fa..80fc35103cf 100644
--- a/src/components/TopBar/CallTime.vue
+++ b/src/components/TopBar/CallTime.vue
@@ -7,8 +7,7 @@
 	<NcPopover class="call-time"
 		:shown.sync="showPopover"
 		:focus-trap="isShowRecordingControls"
-		:triggers="[]"
-		:container="container">
+		:triggers="[]">
 		<template #trigger>
 			<NcButton :disabled="isButtonDisabled"
 				:wide="true"
@@ -110,10 +109,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		/**
 		 * Create date object based on the unix time received from the API
 		 *
diff --git a/src/components/TopBar/ReactionMenu.vue b/src/components/TopBar/ReactionMenu.vue
index 85390239ec4..e37a1bc603c 100644
--- a/src/components/TopBar/ReactionMenu.vue
+++ b/src/components/TopBar/ReactionMenu.vue
@@ -7,7 +7,6 @@
 	<NcActions v-tooltip="t('spreed', 'Send a reaction')"
 		type="tertiary"
 		:aria-label="t('spreed', 'Send a reaction')"
-		:container="container"
 		class="reaction">
 		<template #icon>
 			<EmoticonOutline :size="20" />
@@ -87,10 +86,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		reactionsInSingleRow() {
 			return Math.ceil(this.supportedReactions.length / 2)
 		},
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index e504ff2cf71..462b1acbc6f 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -212,10 +212,6 @@ export default {
 	},
 
 	computed: {
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		isOneToOneConversation() {
 			return this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE
 				|| this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
diff --git a/src/components/TopBar/TopBarMediaControls.vue b/src/components/TopBar/TopBarMediaControls.vue
index e9142886c0f..bb6dbc20ee6 100644
--- a/src/components/TopBar/TopBarMediaControls.vue
+++ b/src/components/TopBar/TopBarMediaControls.vue
@@ -72,7 +72,6 @@
 			:class="screenSharingButtonClass"
 			class="app-navigation-entry-utils-menu-button"
 			:boundaries-element="boundaryElement"
-			:container="container"
 			:disabled="!isScreensharingAllowed"
 			:open.sync="screenSharingMenuOpen">
 			<template #icon>
@@ -261,10 +260,6 @@ export default {
 				: t('spreed', 'Enable screensharing')
 		},
 
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		isQualityWarningTooltipDismissed() {
 			return this.$store.getters.isQualityWarningTooltipDismissed
 		},
diff --git a/src/components/TopBar/TopBarMenu.vue b/src/components/TopBar/TopBarMenu.vue
index b330099d595..ceaf587c0c0 100644
--- a/src/components/TopBar/TopBarMenu.vue
+++ b/src/components/TopBar/TopBarMenu.vue
@@ -21,8 +21,7 @@
 		<NcActions v-if="!isSidebar"
 			v-tooltip="t('spreed', 'Conversation actions')"
 			:aria-label="t('spreed', 'Conversation actions')"
-			type="tertiary"
-			:container="container">
+			type="tertiary">
 			<!-- Menu icon: white if in call -->
 			<template v-if="isInCall" #icon>
 				<DotsHorizontal :size="20" />
@@ -296,10 +295,6 @@ export default {
 				|| this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
 		},
 
-		container() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
 		changeViewText() {
 			return this.isGrid
 				? t('spreed', 'Speaker view')
diff --git a/src/main.js b/src/main.js
index 0f6ac58d766..b3e9db0320c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,8 +12,6 @@ import { getRequestToken } from '@nextcloud/auth'
 import { emit } from '@nextcloud/event-bus'
 import { generateFilePath } from '@nextcloud/router'
 
-import { options as TooltipOptions } from '@nextcloud/vue/dist/Directives/Tooltip.js'
-
 import App from './App.vue'
 
 import './init.js'
@@ -51,9 +49,6 @@ Vue.use(VueRouter)
 
 const pinia = createPinia()
 
-TooltipOptions.container = 'body'
-store.dispatch('setMainContainerSelector', 'body')
-
 const instance = new Vue({
 	el: '#content',
 	store,
diff --git a/src/mainFilesSidebar.js b/src/mainFilesSidebar.js
index 23fd88626a1..06b9049470e 100644
--- a/src/mainFilesSidebar.js
+++ b/src/mainFilesSidebar.js
@@ -42,8 +42,6 @@ Vue.use(Vuex)
 
 const pinia = createPinia()
 
-store.dispatch('setMainContainerSelector', 'body')
-
 const newCallView = () => new Vue({
 	store,
 	pinia,
diff --git a/src/mainPublicShareAuthSidebar.js b/src/mainPublicShareAuthSidebar.js
index a1b307a50c1..833bea9082a 100644
--- a/src/mainPublicShareAuthSidebar.js
+++ b/src/mainPublicShareAuthSidebar.js
@@ -41,7 +41,6 @@ Vue.use(PiniaVuePlugin)
 Vue.use(Vuex)
 
 const pinia = createPinia()
-store.dispatch('setMainContainerSelector', 'body')
 
 /**
  * Wraps all the body contents in its own container.
diff --git a/src/mainPublicShareSidebar.js b/src/mainPublicShareSidebar.js
index 5f93a8e5fea..ccd6a34c960 100644
--- a/src/mainPublicShareSidebar.js
+++ b/src/mainPublicShareSidebar.js
@@ -42,8 +42,6 @@ Vue.use(Vuex)
 
 const pinia = createPinia()
 
-store.dispatch('setMainContainerSelector', 'body')
-
 /**
  *
  */
diff --git a/src/mainRecording.js b/src/mainRecording.js
index c17f4d5e118..e73a5483d56 100644
--- a/src/mainRecording.js
+++ b/src/mainRecording.js
@@ -12,8 +12,6 @@ import Vuex from 'vuex'
 import { getRequestToken } from '@nextcloud/auth'
 import { generateFilePath } from '@nextcloud/router'
 
-import { options as TooltipOptions } from '@nextcloud/vue/dist/Directives/Tooltip.js'
-
 import Recording from './Recording.vue'
 
 import router from './router/router.js'
@@ -52,9 +50,6 @@ Vue.use(VueRouter)
 
 const pinia = createPinia()
 
-TooltipOptions.container = 'body'
-store.dispatch('setMainContainerSelector', 'body')
-
 window.store = store
 
 if (!window.OCA.Talk) {
diff --git a/src/store/storeConfig.js b/src/store/storeConfig.js
index 8c35643e669..b0c818175a2 100644
--- a/src/store/storeConfig.js
+++ b/src/store/storeConfig.js
@@ -12,7 +12,6 @@ import messagesStore from './messagesStore.js'
 import participantsStore from './participantsStore.js'
 import soundsStore from './soundsStore.js'
 import tokenStore from './tokenStore.js'
-import uiModeStore from './uiModeStore.js'
 
 export default {
 	modules: {
@@ -25,7 +24,6 @@ export default {
 		participantsStore,
 		soundsStore,
 		tokenStore,
-		uiModeStore,
 	},
 
 	mutations: {},
diff --git a/src/store/uiModeStore.js b/src/store/uiModeStore.js
deleted file mode 100644
index 03eb69fa265..00000000000
--- a/src/store/uiModeStore.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-/**
- * This store handles the values that need to be customized depending on the
- * current UI mode of Talk (main UI, embedded in Files sidebar, video
- * verification page...).
- */
-
-const state = {
-	mainContainerSelector: undefined,
-}
-
-const getters = {
-	getMainContainerSelector: (state, getters, rootState, rootGetters) => () => {
-		return state.mainContainerSelector
-	},
-}
-
-const mutations = {
-	setMainContainerSelector(state, mainContainerSelector) {
-		state.mainContainerSelector = mainContainerSelector
-	},
-}
-
-const actions = {
-	/**
-	 * Set the main container selector.
-	 *
-	 * By default the container selector is undefined, which in practice will
-	 * cause the components to use "body" as the selector.
-	 *
-	 * @param {object} context default store context
-	 * @param {string} mainContainerSelector the selector for the container
-	 */
-	setMainContainerSelector(context, mainContainerSelector) {
-		context.commit('setMainContainerSelector', mainContainerSelector)
-	},
-}
-
-export default { state, mutations, getters, actions }