diff --git a/src/components/MailboxPicker.vue b/src/components/MailboxPicker.vue
index 9ed2977d27..eedd7f2928 100644
--- a/src/components/MailboxPicker.vue
+++ b/src/components/MailboxPicker.vue
@@ -127,6 +127,11 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+
+		select: {
+			type: Function,
+			required: true,
+		},
 	},
 
 	data() {
@@ -180,7 +185,7 @@ export default {
 				{
 					variant: 'primary',
 					disabled: this.loading || (!this.allowRoot && !this.selectedMailboxId),
-					callback: this.onSelect,
+					callback: () => this.select(this.selectedMailboxId),
 					label: this.loading ? this.labelSelectLoading : this.labelSelect,
 				},
 			]
@@ -241,12 +246,6 @@ export default {
 			this.$emit('update:selected', this.selectedMailboxId)
 		},
 
-		async onSelect() {
-			return new Promise((resolve) => {
-				this.$emit('select', this.selectedMailboxId, () => resolve())
-			})
-		},
-
 		onClose() {
 			this.$emit('close')
 		},
diff --git a/src/components/MoveMailboxModal.vue b/src/components/MoveMailboxModal.vue
index 4044778cd9..530dfdaddc 100644
--- a/src/components/MoveMailboxModal.vue
+++ b/src/components/MoveMailboxModal.vue
@@ -11,7 +11,7 @@
 		:allow-root="true"
 		:label-select="t('mail', 'Move')"
 		:label-select-loading="t('mail', 'Moving')"
-		@select="onMove"
+		:select="onMove"
 		@close="onClose" />
 </template>
 
diff --git a/src/components/MoveModal.vue b/src/components/MoveModal.vue
index cc9582e449..681f2543da 100644
--- a/src/components/MoveModal.vue
+++ b/src/components/MoveModal.vue
@@ -9,7 +9,7 @@
 		:loading="moving"
 		:label-select="moveThread ? t('mail', 'Move thread') : t('mail', 'Move message')"
 		:label-select-loading="moveThread ? t('mail', 'Moving thread') : t('mail', 'Moving message')"
-		@select="onMove"
+		:select="onMove"
 		@close="onClose" />
 </template>