diff --git a/src/components/ConversationSettings/ConversationAvatarEditor.vue b/src/components/ConversationSettings/ConversationAvatarEditor.vue
index 16692446f2..f4ca7207ff 100644
--- a/src/components/ConversationSettings/ConversationAvatarEditor.vue
+++ b/src/components/ConversationSettings/ConversationAvatarEditor.vue
@@ -238,6 +238,8 @@ export default {
 		},
 	},
 
+	expose: ['saveAvatar'],
+
 	methods: {
 		activateLocalFilePicker() {
 			// Set to null so that selecting the same file will trigger the change event
diff --git a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
index f995380724..deacdf83d1 100644
--- a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
+++ b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
@@ -20,9 +20,9 @@
 -->
 
 <template>
-	<div class="wrapper">
+	<div v-if="modal" class="wrapper">
 		<!-- New group form -->
-		<NcModal v-if="modal && page !== 2"
+		<NcModal v-show=" page !== 2"
 			class="conversation-form"
 			:container="container"
 			@close="closeModal">
@@ -118,7 +118,7 @@
 		</NcModal>
 
 		<!-- Third page : this is the confirmation page-->
-		<NcModal v-else-if="page === 2"
+		<NcModal v-if="page === 2"
 			:container="container"
 			@close="closeModal">
 			<NcEmptyContent>