2 files changed, 13 insertions, 8 deletions
diff --git a/src/components/AvatarWrapper/AvatarWrapper.vue b/src/components/AvatarWrapper/AvatarWrapper.vue
index ce9bcf668..3b66086d7 100644
--- a/src/components/AvatarWrapper/AvatarWrapper.vue
+++ b/src/components/AvatarWrapper/AvatarWrapper.vue
@@ -1,7 +1,7 @@
 <!--
-  - @copyright Copyright (c) 2020 Marco Ambrosini <marcoambrosini@pm.me>
+  - @copyright Copyright (c) 2020 Marco Ambrosini <marcoambrosini@icloud.com>
   -
-  - @author Marco Ambrosini <marcoambrosini@pm.me>
+  - @author Marco Ambrosini <marcoambrosini@icloud.com>
   -
   - @license GNU AGPL version 3 or any later version
   -
@@ -28,7 +28,7 @@
 		<Avatar v-else-if="!isGuest"
 			:user="id"
 			:display-name="name"
-			:menu-container="menuContainer"
+			:menu-container="menuContainerWithFallback"
 			menu-position="left"
 			:disable-tooltip="disableTooltip"
 			:disable-menu="disableMenu"
@@ -97,6 +97,11 @@ export default {
 			type: Object,
 			default: undefined,
 		},
+
+		menuContainer: {
+			type: String,
+			default: undefined,
+		},
 	},
 	computed: {
 		// Determines which icon is displayed
@@ -117,10 +122,10 @@ export default {
 			const customName = this.name !== t('spreed', 'Guest') ? this.name : '?'
 			return customName.charAt(0)
 		},
-		menuContainer() {
-			return this.$store.getters.getMainContainerSelector()
+		menuContainerWithFallback() {
+			return this.menuContainer ? this.menuContainer : this.$store.getters.getMainContainerSelector()
 		},
-		// Takes the the size prop and makes it a string for the classes
+		// Takes the size prop and makes it a string for the classes
 		sizeToString() {
 			return this.size.toString()
 		},
diff --git a/src/components/AvatarWrapper/AvatarWrapperSmall.vue b/src/components/AvatarWrapper/AvatarWrapperSmall.vue
index 535967e2a..3dc287469 100644
--- a/src/components/AvatarWrapper/AvatarWrapperSmall.vue
+++ b/src/components/AvatarWrapper/AvatarWrapperSmall.vue
@@ -1,7 +1,7 @@
 <!--
-  - @copyright Copyright (c) 2020 Marco Ambrosini <marcoambrosini@pm.me>
+  - @copyright Copyright (c) 2020 Marco Ambrosini <marcoambrosini@icloud.com>
   -
-  - @author Marco Ambrosini <marcoambrosini@pm.me>
+  - @author Marco Ambrosini <marcoambrosini@icloud.com>
   -
   - @license GNU AGPL version 3 or any later version
   -