diff --git a/src/Components/Common/EditNameDialog.vue b/src/Components/Common/EditNameDialog.vue
index 9980a9af30..618ce24a1b 100644
--- a/src/Components/Common/EditNameDialog.vue
+++ b/src/Components/Common/EditNameDialog.vue
@@ -3,10 +3,9 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<NcDialog v-if="open"
+	<NcDialog
 		:name="title"
-		:buttons="dialogButtons"
-		@closing="$emit('close')">
+		:buttons="dialogButtons">
 		<NcNoteCard v-if="localSuccessMessage" type="success">
 			{{ localSuccessMessage }}
 		</NcNoteCard>
@@ -42,10 +41,6 @@ export default {
 		NcNoteCard,
 	},
 	props: {
-		open: {
-			type: Boolean,
-			required: true,
-		},
 		name: {
 			type: String,
 			default: '',
@@ -62,15 +57,11 @@ export default {
 			type: String,
 			default: 'Enter name',
 		},
-		loading: {
-			type: Boolean,
-			default: false,
-		},
 	},
-	emits: ['close', 'save'],
+	emits: ['close'],
 	data() {
 		return {
-			localName: '',
+			localName: this.name || '',
 			localSuccessMessage: '',
 			localErrorMessage: '',
 			inputId: `edit-name-${Math.random().toString(36).substr(2, 9)}`,
@@ -86,13 +77,13 @@ export default {
 				{
 					label: this.t('libresign', 'Cancel'),
 					callback: () => {
-						this.$emit('close')
+						this.handleClose()
 					},
 				},
 				{
 					label: this.t('libresign', 'Save'),
 					type: 'primary',
-					disabled: !this.isNameValid || this.loading,
+					disabled: !this.isNameValid,
 					callback: () => {
 						this.handleSave()
 					},
@@ -101,16 +92,8 @@ export default {
 		},
 	},
 	watch: {
-		open(newVal) {
-			if (newVal) {
-				this.localName = this.name || ''
-				this.clearMessages()
-			}
-		},
 		name(newVal) {
-			if (this.open) {
-				this.localName = newVal || ''
-			}
+			this.localName = newVal || ''
 		},
 	},
 	methods: {
@@ -129,8 +112,11 @@ export default {
 			this.clearMessages()
 			this.localErrorMessage = message
 		},
+		handleClose() {
+			this.$emit('close', null)
+		},
 		handleSave() {
-			if (!this.isNameValid || this.loading) {
+			if (!this.isNameValid) {
 				return
 			}
 
@@ -151,12 +137,7 @@ export default {
 				return
 			}
 
-			if (trimmedName === this.name) {
-				this.$emit('close')
-				return
-			}
-
-			this.$emit('save', trimmedName)
+			this.$emit('close', trimmedName)
 		},
 	},
 }
diff --git a/src/Components/Request/RequestPicker.vue b/src/Components/Request/RequestPicker.vue
index 1f0ea0d9c9..c495cd68f7 100644
--- a/src/Components/Request/RequestPicker.vue
+++ b/src/Components/Request/RequestPicker.vue
@@ -75,15 +75,6 @@
 				</NcButton>
 			</template>
 		</NcDialog>
-		<EditNameDialog v-if="showEnvelopeNameModal"
-			:open="showEnvelopeNameModal"
-			:name="envelopeName"
-			:title="t('libresign', 'Envelope name')"
-			:label="t('libresign', 'Enter a name for the envelope')"
-			:placeholder="t('libresign', 'Envelope name')"
-			:loading="loading"
-			@save="confirmEnvelopeName"
-			@close="cancelEnvelopeName" />
 	</div>
 </template>
 <script>
@@ -97,6 +88,7 @@ import { getCapabilities } from '@nextcloud/capabilities'
 import { showError } from '@nextcloud/dialogs'
 import { FilePickerVue as FilePicker } from '@nextcloud/dialogs/filepicker.js'
 import { loadState } from '@nextcloud/initial-state'
+import { spawnDialog } from '@nextcloud/vue/functions/dialog'
 
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import NcActions from '@nextcloud/vue/components/NcActions'
@@ -116,7 +108,6 @@ export default {
 	name: 'RequestPicker',
 	components: {
 		CloudUploadIcon,
-		EditNameDialog,
 		FilePicker,
 		FolderIcon,
 		LinkIcon,
@@ -160,8 +151,6 @@ export default {
 			uploadedBytes: 0,
 			totalBytes: 0,
 			uploadStartTime: null,
-			showEnvelopeNameModal: false,
-			envelopeName: '',
 			pendingPaths: [],
 			pendingFiles: [],
 		}
@@ -290,9 +279,20 @@ export default {
 
 				if (files.length > 1 && this.envelopeEnabled) {
 					this.pendingFiles = files
-					this.envelopeName = ''
-					this.showEnvelopeNameModal = true
+					const [envelopeName] = await spawnDialog(
+						EditNameDialog,
+						{
+							title: this.t('libresign', 'Envelope name'),
+							label: this.t('libresign', 'Enter a name for the envelope'),
+							placeholder: this.t('libresign', 'Envelope name'),
+						},
+					)
 					input.remove()
+
+					if (envelopeName) {
+						await this.upload(files, envelopeName)
+					}
+					this.pendingFiles = []
 					return
 				}
 
@@ -329,8 +329,36 @@ export default {
 
 			if (this.envelopeEnabled && paths.length > 1) {
 				this.pendingPaths = paths
-				this.envelopeName = ''
-				this.showEnvelopeNameModal = true
+				const [envelopeName] = await spawnDialog(
+					EditNameDialog,
+					{
+						title: this.t('libresign', 'Envelope name'),
+						label: this.t('libresign', 'Enter a name for the envelope'),
+						placeholder: this.t('libresign', 'Envelope name'),
+					},
+				)
+
+				if (envelopeName) {
+					const filesPayload = paths.map((path) => ({
+						file: { path },
+						name: (path.match(/([^/]*?)(?:\.[^.]*)?$/)[1] ?? ''),
+					}))
+					await this.filesStore.upload({
+						files: filesPayload,
+						name: envelopeName.trim(),
+					})
+						.then((fileId) => {
+							this.filesStore.selectFile(fileId)
+						})
+						.catch(({ response }) => {
+							showError(response?.data?.ocs?.data?.message || this.t('libresign', 'Upload failed'))
+						})
+						.finally(() => {
+							this.pendingPaths = []
+						})
+				} else {
+					this.pendingPaths = []
+				}
 				return
 			}
 
@@ -348,41 +376,6 @@ export default {
 					showError(response.data.ocs.data.message)
 				})
 		},
-		confirmEnvelopeName(newName) {
-			this.envelopeName = newName
-			this.showEnvelopeNameModal = false
-
-			if (this.pendingPaths.length > 0) {
-				const filesPayload = this.pendingPaths.map((path) => ({
-					file: { path },
-					name: (path.match(/([^/]*?)(?:\.[^.]*)?$/)[1] ?? ''),
-				}))
-				this.filesStore.upload({
-					files: filesPayload,
-					name: this.envelopeName.trim(),
-				})
-					.then((fileId) => {
-						this.filesStore.selectFile(fileId)
-					})
-					.catch(({ response }) => {
-						showError(response?.data?.ocs?.data?.message || t('libresign', 'Upload failed'))
-					})
-					.finally(() => {
-						this.pendingPaths = []
-						this.envelopeName = ''
-					})
-				return
-			}
-
-			const files = this.pendingFiles
-			this.upload(files)
-		},
-		cancelEnvelopeName() {
-			this.pendingFiles = []
-			this.pendingPaths = []
-			this.envelopeName = ''
-			this.showEnvelopeNameModal = false
-		},
 	},
 }
 </script>