diff --git a/apps/files_sharing/src/components/NewFileRequestDialog.vue b/apps/files_sharing/src/components/NewFileRequestDialog.vue
index 24de10b725e9b..5a03fcc0e0d6b 100644
--- a/apps/files_sharing/src/components/NewFileRequestDialog.vue
+++ b/apps/files_sharing/src/components/NewFileRequestDialog.vue
@@ -9,6 +9,7 @@
 		data-cy-file-request-dialog
 		:close-on-click-outside="false"
 		:name="currentStep !== STEP.LAST ? t('files_sharing', 'Create a file request') : t('files_sharing', 'File request created')"
+		:set-return-focus="returnFocusTarget"
 		size="normal"
 		@closing="onCancel">
 		<!-- Header -->
@@ -226,6 +227,10 @@ export default defineComponent({
 	},
 
 	methods: {
+		returnFocusTarget(): HTMLElement | null {
+			return document.querySelector<HTMLElement>('[data-cy-upload-picker] button')
+		},
+
 		onPageNext() {
 			const form = this.$refs.form as HTMLFormElement
 
diff --git a/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogDatePassword.vue b/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogDatePassword.vue
index b2505c8e06f10..482919ff173b5 100644
--- a/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogDatePassword.vue
+++ b/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogDatePassword.vue
@@ -27,7 +27,6 @@
 				v-if="expirationDate !== null"
 				id="file-request-dialog-expirationDate"
 				:disabled="disabled"
-				:hide-label="true"
 				:label="t('files_sharing', 'Expiration date')"
 				:max="maxDate"
 				:min="minDate"
diff --git a/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogFinish.vue b/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogFinish.vue
index fc01d5513b680..997e5884fa5f1 100644
--- a/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogFinish.vue
+++ b/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogFinish.vue
@@ -40,24 +40,27 @@
 				@focusout.native="addNewEmail" />
 
 			<!-- Email list -->
-			<div v-if="emails.length > 0" class="file-request-dialog__emails">
-				<NcChip
-					v-for="mail in emails"
-					:key="mail"
-					:aria-label-close="t('files_sharing', 'Remove email')"
-					:text="mail"
-					@close="$emit('remove-email', mail)">
-					<template #icon>
-						<NcAvatar
-							disable-menu
-							disable-tooltip
-							:display-name="mail"
-							is-no-user
-							hide-status
-							:size="24" />
-					</template>
-				</NcChip>
-			</div>
+			<ul
+				v-if="emails.length > 0"
+				class="file-request-dialog__emails"
+				:aria-label="t('files_sharing', 'Recipient emails')">
+				<li v-for="mail in emails" :key="mail">
+					<NcChip
+						:aria-label-close="t('files_sharing', 'Remove email: {email}', { email: mail })"
+						:text="mail"
+						@close="$emit('remove-email', mail)">
+						<template #icon>
+							<NcAvatar
+								disable-menu
+								disable-tooltip
+								:display-name="mail"
+								is-no-user
+								hide-status
+								:size="24" />
+						</template>
+					</NcChip>
+				</li>
+			</ul>
 		</template>
 	</div>
 </template>
@@ -229,14 +232,16 @@ export default defineComponent({
 </script>
 
 <style scoped>
-.input-field,
-.file-request-dialog__emails {
+.input-field {
 	margin-top: var(--margin);
 }
 
 .file-request-dialog__emails {
 	display: flex;
-	gap: var(--default-grid-baseline);
 	flex-wrap: wrap;
+	gap: var(--default-grid-baseline);
+	list-style: none;
+	margin-block: var(--margin) 0;
+	padding-inline: 0;
 }
 </style>
diff --git a/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogIntro.vue b/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogIntro.vue
index d4602872afe18..7f27c4d3df85b 100644
--- a/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogIntro.vue
+++ b/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogIntro.vue
@@ -8,9 +8,12 @@
 		<!-- Request label -->
 		<fieldset class="file-request-dialog__label" data-cy-file-request-dialog-fieldset="label">
 			<legend>
-				{{ t('files_sharing', 'What are you requesting?') }}
+				<label class="file-request-dialog__legend-label" for="file-request-dialog-label">
+					{{ t('files_sharing', 'What are you requesting?') }}
+				</label>
 			</legend>
 			<NcTextField
+				id="file-request-dialog-label"
 				:model-value="label"
 				:disabled="disabled"
 				:label="t('files_sharing', 'Request subject')"
@@ -23,9 +26,12 @@
 		<!-- Request destination -->
 		<fieldset class="file-request-dialog__destination" data-cy-file-request-dialog-fieldset="destination">
 			<legend>
-				{{ t('files_sharing', 'Where should these files go?') }}
+				<label class="file-request-dialog__legend-label" for="file-request-dialog-destination">
+					{{ t('files_sharing', 'Where should these files go?') }}
+				</label>
 			</legend>
 			<NcTextField
+				id="file-request-dialog-destination"
 				:model-value="destination"
 				:disabled="disabled"
 				:label="t('files_sharing', 'Upload destination')"
@@ -37,9 +43,10 @@
 				trailing-button-icon="undo"
 				:trailing-button-label="t('files_sharing', 'Revert to default')"
 				name="destination"
+				aria-haspopup="dialog"
 				@click="onPickDestination"
-				@keypress.prevent.stop="/* prevent typing in the input, we use the picker */"
-				@paste.prevent.stop="/* prevent pasting in the input, we use the picker */"
+				@keydown="onDestinationKeydown"
+				@paste.prevent.stop
 				@trailing-button-click="$emit('update:destination', '')">
 				<IconFolder :size="18" />
 			</NcTextField>
@@ -53,9 +60,12 @@
 		<!-- Request note -->
 		<fieldset class="file-request-dialog__note" data-cy-file-request-dialog-fieldset="note">
 			<legend>
-				{{ t('files_sharing', 'Add a note') }}
+				<label class="file-request-dialog__legend-label" for="file-request-dialog-note">
+					{{ t('files_sharing', 'Add a note') }}
+				</label>
 			</legend>
 			<NcTextArea
+				id="file-request-dialog-note"
 				:model-value="note"
 				:disabled="disabled"
 				:label="t('files_sharing', 'Note for recipient')"
@@ -138,6 +148,22 @@ export default defineComponent({
 	},
 
 	methods: {
+		onDestinationKeydown(event: KeyboardEvent) {
+			if (event.key === 'Enter' || event.key === ' ') {
+				event.preventDefault()
+				this.onPickDestination()
+				return
+			}
+
+			// Destination is chosen in the picker, not by editing this field
+			if (event.ctrlKey || event.metaKey || event.altKey) {
+				return
+			}
+			if (event.key.length === 1 || event.key === 'Backspace' || event.key === 'Delete') {
+				event.preventDefault()
+			}
+		},
+
 		onPickDestination() {
 			const filepicker = getFilePickerBuilder(t('files_sharing', 'Select a destination'))
 				.addMimeTypeFilter('httpd/unix-directory')
@@ -168,6 +194,16 @@ export default defineComponent({
 </script>
 
 <style scoped>
+.file-request-dialog__legend-label {
+	font: inherit;
+	color: inherit;
+	cursor: pointer;
+}
+
+.file-request-dialog__destination :deep(.input-field__input) {
+	cursor: pointer;
+}
+
 .file-request-dialog__note :deep(textarea) {
 	width: 100% !important;
 	min-height: 80px;
diff --git a/apps/files_sharing/src/files_newMenu/newFileRequest.ts b/apps/files_sharing/src/files_newMenu/newFileRequest.ts
index d29a977b05b9b..664b09b1e46c6 100644
--- a/apps/files_sharing/src/files_newMenu/newFileRequest.ts
+++ b/apps/files_sharing/src/files_newMenu/newFileRequest.ts
@@ -35,9 +35,11 @@ export const entry: NewMenuEntry = {
 		return sharingConfig.isPublicShareAllowed
 	},
 	async handler(context: Folder, content: Node[]) {
-		spawnDialog(NewFileRequestDialogVue, {
+		await spawnDialog(NewFileRequestDialogVue, {
 			context,
 			content,
 		})
+		// The menu item that opened the dialog is gone; send focus back to New
+		document.querySelector<HTMLElement>('[data-cy-upload-picker] button')?.focus()
 	},
 }