diff --git a/src/components/DeviceChecker/DeviceChecker.vue b/src/components/DeviceChecker/DeviceChecker.vue
index 566581e4985..325cbb74fa9 100644
--- a/src/components/DeviceChecker/DeviceChecker.vue
+++ b/src/components/DeviceChecker/DeviceChecker.vue
@@ -23,6 +23,7 @@
 	<NcModal v-if="modal"
 		class="talk-modal"
 		size="small"
+		:container="$store.getters.getMainContainerSelector()"
 		@close="closeModal">
 		<div class="device-checker">
 			<h2 class="device-checker__title">
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Poll.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Poll.vue
index f83c9d4cd6c..3fd1e7b7982 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Poll.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Poll.vue
@@ -50,6 +50,7 @@
 		<!-- voting and results dialog -->
 		<NcModal v-if="vote !== undefined && showModal"
 			size="small"
+			:container="$store.getters.getMainContainerSelector()"
 			@close="dismissModal">
 			<div class="poll__modal">
 				<!-- First screen, displayed while voting-->
diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 66abdf1c167..3693a0ae6db 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -163,6 +163,7 @@
 		<!-- Text file creation dialog -->
 		<NcModal v-if="showTextFileDialog !== false"
 			size="normal"
+			:container="$store.getters.getMainContainerSelector()"
 			class="templates-picker"
 			@close="dismissTextFileCreation">
 			<div class="new-text-file">
diff --git a/src/components/NewMessageForm/SimplePollsEditor/SimplePollsEditor.vue b/src/components/NewMessageForm/SimplePollsEditor/SimplePollsEditor.vue
index d63aa48f9d1..6b54d955ca2 100644
--- a/src/components/NewMessageForm/SimplePollsEditor/SimplePollsEditor.vue
+++ b/src/components/NewMessageForm/SimplePollsEditor/SimplePollsEditor.vue
@@ -21,7 +21,9 @@
   -->
 
 <template>
-	<NcModal size="small" v-on="$listeners">
+	<NcModal size="small"
+		:container="$store.getters.getMainContainerSelector()"
+		v-on="$listeners">
 		<div class="simple-polls-editor">
 			<h2>{{ t('spreed', 'Create new poll') }}</h2>
 
diff --git a/src/components/PermissionsEditor/PermissionsEditor.vue b/src/components/PermissionsEditor/PermissionsEditor.vue
index 090789cce65..bfeeadb8ed0 100644
--- a/src/components/PermissionsEditor/PermissionsEditor.vue
+++ b/src/components/PermissionsEditor/PermissionsEditor.vue
@@ -21,6 +21,7 @@
 
 <template>
 	<NcModal size="small"
+		:container="$store.getters.getMainContainerSelector()"
 		v-on="$listeners">
 		<div class="wrapper">
 			<template v-if="!loading">