diff --git a/src/components/NewConversationDialog/NewConversationDialog.vue b/src/components/NewConversationDialog/NewConversationDialog.vue
index 41d5fd33e66..9622b1b7290 100644
--- a/src/components/NewConversationDialog/NewConversationDialog.vue
+++ b/src/components/NewConversationDialog/NewConversationDialog.vue
@@ -24,6 +24,7 @@
 		<!-- New group form -->
 		<NcModal v-show="page !== 2"
 			class="new-group-conversation"
+			:close-on-click-outside="!isFilled"
 			:container="container"
 			@close="closeModal">
 			<h2 class="new-group-conversation__header">
@@ -227,6 +228,11 @@ export default {
 				|| this.conversationName.length > CONVERSATION.MAX_NAME_LENGTH
 				|| this.newConversation.description.length > CONVERSATION.MAX_DESCRIPTION_LENGTH
 		},
+
+		isFilled() {
+			return JSON.stringify(this.newConversation) !== JSON.stringify(NEW_CONVERSATION)
+				|| this.listable !== CONVERSATION.LISTABLE.NONE || this.isAvatarEdited
+		},
 	},
 
 	watch: {
diff --git a/src/components/NewMessage/NewMessagePollEditor.vue b/src/components/NewMessage/NewMessagePollEditor.vue
index b18b2696a66..f411d9daa1f 100644
--- a/src/components/NewMessage/NewMessagePollEditor.vue
+++ b/src/components/NewMessage/NewMessagePollEditor.vue
@@ -23,6 +23,7 @@
 
 <template>
 	<NcModal size="small"
+		:close-on-click-outside="!isFilled"
 		:container="container"
 		v-on="$listeners">
 		<div class="poll-editor">
@@ -133,6 +134,10 @@ export default {
 		container() {
 			return this.$store.getters.getMainContainerSelector()
 		},
+
+		isFilled() {
+			return !!this.pollQuestion || this.pollOptions.some(option => option)
+		},
 	},
 
 	methods: {
diff --git a/src/components/NewMessage/NewMessageUploadEditor.vue b/src/components/NewMessage/NewMessageUploadEditor.vue
index 5e2d8fcee40..bae56bed56d 100644
--- a/src/components/NewMessage/NewMessageUploadEditor.vue
+++ b/src/components/NewMessage/NewMessageUploadEditor.vue
@@ -23,6 +23,7 @@
 	<NcModal v-if="showModal"
 		ref="modal"
 		:size="isVoiceMessage ? 'small' : 'normal'"
+		:close-on-click-outside="false"
 		:container="container"
 		@close="handleDismiss">
 		<div class="upload-editor"