diff --git a/src/FilesSidebarTabApp.vue b/src/FilesSidebarTabApp.vue
index 958a6cea3bc..69f8f36ffea 100644
--- a/src/FilesSidebarTabApp.vue
+++ b/src/FilesSidebarTabApp.vue
@@ -384,6 +384,24 @@ export default {
 }
 </script>
 
+<style>
+/* FIXME: remove after https://github.com/nextcloud-libraries/nextcloud-vue/pull/4959 is released */
+body .modal-wrapper * {
+	box-sizing: border-box;
+}
+
+/* FIXME: Align styles of NcModal header with NcDialog header. Remove if all are migrated */
+body .modal-wrapper h2.nc-dialog-alike-header {
+	font-size: 21px;
+	text-align: center;
+	height: fit-content;
+	min-height: var(--default-clickable-area);
+	line-height: var(--default-clickable-area);
+	overflow-wrap: break-word;
+	margin-block: 0 12px;
+}
+</style>
+
 <style scoped>
 .talkChatTab {
 	height: 100%;
diff --git a/src/PublicShareAuthSidebar.vue b/src/PublicShareAuthSidebar.vue
index 4468008832d..2118ca20a32 100644
--- a/src/PublicShareAuthSidebar.vue
+++ b/src/PublicShareAuthSidebar.vue
@@ -211,6 +211,11 @@ export default {
 #talk-sidebar *::after {
 	box-sizing: border-box;
 }
+
+ /* FIXME: remove after https://github.com/nextcloud-libraries/nextcloud-vue/pull/4959 is released */
+body .modal-wrapper * {
+	box-sizing: border-box;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
index 2dcea80401b..3997dc321f1 100644
--- a/src/PublicShareSidebar.vue
+++ b/src/PublicShareSidebar.vue
@@ -251,6 +251,13 @@ export default {
 }
 </script>
 
+<style>
+/* FIXME: remove after https://github.com/nextcloud-libraries/nextcloud-vue/pull/4959 is released */
+body .modal-wrapper * {
+	box-sizing: border-box;
+}
+</style>
+
 <style lang="scss" scoped>
 /* Properties based on the app-sidebar */
 #talk-sidebar {
diff --git a/src/Recording.vue b/src/Recording.vue
index be78d9d917a..dfcf9bee1cb 100644
--- a/src/Recording.vue
+++ b/src/Recording.vue
@@ -54,6 +54,13 @@ export default {
 }
 </script>
 
+<style>
+/* FIXME: remove after https://github.com/nextcloud-libraries/nextcloud-vue/pull/4959 is released */
+body .modal-wrapper * {
+	box-sizing: border-box;
+}
+</style>
+
 <style lang="scss" scoped>
 /* The CallView descendants expect border-box to be set, as in the normal UI the
  * CallView is a descendant of NcContent, which applies the border-box to all
diff --git a/src/components/BreakoutRoomsEditor/SendMessageDialog.vue b/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
index 50343f51056..3256a0ead3b 100644
--- a/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
+++ b/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<NcDialog ref="modal"
+	<NcDialog ref="dialog"
 		:name="dialogTitle"
 		:container="container"
 		close-on-click-outside
@@ -91,7 +91,7 @@ export default {
 
 	mounted() {
 		// Postpone render of NewMessage until modal container is mounted
-		this.modalContainerId = `#modal-description-${this.$refs.modal.navigationId}`
+		this.modalContainerId = '#' + this.$refs.dialog.$el.querySelector('.modal-container')?.id
 		this.$nextTick(() => {
 			this.$refs.newMessage.focusInput()
 		})
diff --git a/src/main.js b/src/main.js
index df6f2533bf9..0f6ac58d766 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,8 +51,8 @@ Vue.use(VueRouter)
 
 const pinia = createPinia()
 
-TooltipOptions.container = '#content-vue'
-store.dispatch('setMainContainerSelector', '#content-vue')
+TooltipOptions.container = 'body'
+store.dispatch('setMainContainerSelector', 'body')
 
 const instance = new Vue({
 	el: '#content',
diff --git a/src/mainFilesSidebar.js b/src/mainFilesSidebar.js
index 7191e0a8bc3..23fd88626a1 100644
--- a/src/mainFilesSidebar.js
+++ b/src/mainFilesSidebar.js
@@ -42,7 +42,7 @@ Vue.use(Vuex)
 
 const pinia = createPinia()
 
-store.dispatch('setMainContainerSelector', '.talkChatTab')
+store.dispatch('setMainContainerSelector', 'body')
 
 const newCallView = () => new Vue({
 	store,
diff --git a/src/mainPublicShareAuthSidebar.js b/src/mainPublicShareAuthSidebar.js
index 730ce8bbfc3..a1b307a50c1 100644
--- a/src/mainPublicShareAuthSidebar.js
+++ b/src/mainPublicShareAuthSidebar.js
@@ -41,7 +41,7 @@ Vue.use(PiniaVuePlugin)
 Vue.use(Vuex)
 
 const pinia = createPinia()
-store.dispatch('setMainContainerSelector', '#talk-sidebar')
+store.dispatch('setMainContainerSelector', 'body')
 
 /**
  * Wraps all the body contents in its own container.
diff --git a/src/mainPublicShareSidebar.js b/src/mainPublicShareSidebar.js
index bee64912723..5f93a8e5fea 100644
--- a/src/mainPublicShareSidebar.js
+++ b/src/mainPublicShareSidebar.js
@@ -42,7 +42,7 @@ Vue.use(Vuex)
 
 const pinia = createPinia()
 
-store.dispatch('setMainContainerSelector', '#talk-sidebar')
+store.dispatch('setMainContainerSelector', 'body')
 
 /**
  *
diff --git a/src/mainRecording.js b/src/mainRecording.js
index 56008069664..c17f4d5e118 100644
--- a/src/mainRecording.js
+++ b/src/mainRecording.js
@@ -52,8 +52,8 @@ Vue.use(VueRouter)
 
 const pinia = createPinia()
 
-TooltipOptions.container = '#call-container'
-store.dispatch('setMainContainerSelector', '#call-container')
+TooltipOptions.container = 'body'
+store.dispatch('setMainContainerSelector', 'body')
 
 window.store = store
 
diff --git a/src/store/uiModeStore.js b/src/store/uiModeStore.js
index f79faf88ca4..03eb69fa265 100644
--- a/src/store/uiModeStore.js
+++ b/src/store/uiModeStore.js
@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { useDocumentFullscreen } from '../composables/useDocumentFullscreen.ts'
-
 /**
  * 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
@@ -17,8 +15,7 @@ const state = {
 
 const getters = {
 	getMainContainerSelector: (state, getters, rootState, rootGetters) => () => {
-		const isFullscreen = useDocumentFullscreen()
-		return isFullscreen.value ? state.mainContainerSelector : 'body'
+		return state.mainContainerSelector
 	},
 }