diff --git a/cypress/components/UploadPicker/UploadPicker.cy.ts b/cypress/components/UploadPicker/UploadPicker.cy.ts
index 3686f23d..7b290031 100644
--- a/cypress/components/UploadPicker/UploadPicker.cy.ts
+++ b/cypress/components/UploadPicker/UploadPicker.cy.ts
@@ -264,8 +264,9 @@ describe('Destination management', () => {
 			)
 		})
 
-		cy.get('@component').then((component) => {
-			component.setDestination(new Folder({
+		cy.mount(UploadPicker, { propsData }).then(({ component }) => {
+			const instance = component as InstanceType<typeof UploadPicker>
+			instance.setDestination(new Folder({
 				id: 56,
 				owner: 'user',
 				source: generateRemoteUrl('dav/files/user/Photos'),
@@ -273,7 +274,7 @@ describe('Destination management', () => {
 				root: '/files/user',
 			}))
 			// Wait for prop propagation
-			expect(component.uploadManager.root).to.have.string('/remote.php/dav/files/user/Photos')
+			expect(instance.uploadManager.root).to.have.string('/remote.php/dav/files/user/Photos')
 		})
 
 		cy.get('@input').attachFile({
@@ -335,8 +336,9 @@ describe('Root management', () => {
 			)
 		})
 
-		cy.get('@component').then((component) => {
-			component.setDestination(new Folder({
+		cy.mount(UploadPicker, { propsData }).then(({ component }) => {
+			const instance = component as InstanceType<typeof UploadPicker>
+			instance.setDestination(new Folder({
 				id: 56,
 				owner: 'user',
 				source: generateRemoteUrl('dav/photos/user/albums/2022 Summer Vacations'),
@@ -344,7 +346,7 @@ describe('Root management', () => {
 				root: '/photos/user',
 			}))
 			// Wait for prop propagation
-			expect(component.uploadManager.root).to.have.string('/remote.php/dav/photos/user/albums/2022 Summer Vacations')
+			expect(instance.uploadManager.root).to.have.string('/remote.php/dav/photos/user/albums/2022 Summer Vacations')
 		})
 
 		// Intercept single upload
diff --git a/cypress/components/UploadPicker/hotkeys.cy.ts b/cypress/components/UploadPicker/hotkeys.cy.ts
new file mode 100644
index 00000000..e32a7883
--- /dev/null
+++ b/cypress/components/UploadPicker/hotkeys.cy.ts
@@ -0,0 +1,61 @@
+/* eslint-disable no-unused-expressions */
+/**
+ * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+// dist file might not be built when running eslint only
+// eslint-disable-next-line import/no-unresolved,n/no-missing-import
+import { Folder, Permission, addNewFileMenuEntry, type Entry } from '@nextcloud/files'
+import { generateRemoteUrl } from '@nextcloud/router'
+import { UploadPicker } from '../../../lib/index.ts'
+
+describe('UploadPicker: hotkeys testing', () => {
+	const propsData = {
+		content: () => [],
+		destination: new Folder({
+			id: 56,
+			owner: 'user',
+			source: generateRemoteUrl('dav/files/user/Folder'),
+			permissions: Permission.ALL,
+			root: '/files/user',
+		}),
+	}
+
+	before(() => {
+		addNewFileMenuEntry({
+			id: 'test',
+			displayName: 'Test',
+			iconSvgInline: '<svg></svg>',
+			handler: (...args) => console.debug(args),
+		} as Entry)
+	})
+
+	it('opens the upload menu when pressing shift+u', () => {
+		cy.mount(UploadPicker, { propsData })
+
+		// Check and init aliases
+		cy.get('[data-cy-upload-picker] [data-cy-upload-picker-input]').as('input').should('exist')
+		cy.get('[data-cy-upload-picker] .upload-picker__progress').as('progress').should('exist')
+
+		cy.get('[role="menu"]').should('not.exist')
+
+		cy.get('body').type('{shift}u')
+		cy.get('[role="menu"]').should('be.visible')
+	})
+
+	it('closes the upload menu when pressing escape', () => {
+		cy.mount(UploadPicker, { propsData })
+			.then(({ component }) => {
+				// force the menu to be opened
+				component.openedMenu = true
+			})
+
+		cy.get('[data-cy-upload-picker] [data-cy-upload-picker-input]').as('input').should('exist')
+		cy.get('[data-cy-upload-picker] .upload-picker__progress').as('progress').should('exist')
+
+		cy.get('[role="menu"]').should('be.visible')
+
+		cy.get('body').type('{esc}')
+		cy.get('[role="menu"]').should('not.be.visible')
+	})
+})
diff --git a/cypress/components/UploadPicker/new-menu.cy.ts b/cypress/components/UploadPicker/new-menu.cy.ts
index 430f1baf..e4b0b36a 100644
--- a/cypress/components/UploadPicker/new-menu.cy.ts
+++ b/cypress/components/UploadPicker/new-menu.cy.ts
@@ -137,11 +137,9 @@ describe('UploadPicker: "new"-menu', () => {
 			// Check and init aliases
 			cy.get('[data-cy-upload-picker] [data-cy-upload-picker-input]').as('input').should('exist')
 			cy.get('[data-cy-upload-picker] .upload-picker__progress').as('progress').should('exist')
-			cy.get('[data-cy-upload-picker] .action-item__menutoggle')
-				.as('menuButton')
-				.should('exist')
+			cy.get('[data-cy-upload-picker] .action-item__menutoggle').should('exist')
 
-			cy.get('@menuButton').click()
+			cy.get('[data-cy-upload-picker] .action-item__menutoggle').click()
 			cy.get('[data-cy-upload-picker-menu-entry="upload-file"]').should('have.length', 1)
 			cy.get('[data-cy-upload-picker-menu-entry="empty-file"]').should('have.length', 1)
 
@@ -152,42 +150,42 @@ describe('UploadPicker: "new"-menu', () => {
 				})
 		})
 
-		it('Changes the context', () => {
+		it.only('Changes the context', () => {
 			// Mount picker
-			cy.mount(UploadPicker, { propsData })
-
-			// Check and init aliases
-			cy.get('[data-cy-upload-picker] [data-cy-upload-picker-input]').as('input').should('exist')
-			cy.get('[data-cy-upload-picker] .upload-picker__progress').as('progress').should('exist')
-			cy.get('[data-cy-upload-picker] .action-item__menutoggle')
-				.as('menuButton')
-				.should('exist')
-
-			cy.get('@menuButton').click()
-			cy.get('[data-cy-upload-picker-menu-entry="upload-file"]').should('have.length', 1)
-			cy.get('[data-cy-upload-picker-menu-entry="empty-file"]').should('have.length', 1)
-
-			// Close menu
-			cy.get('body').click()
-			cy.get('[data-cy-upload-picker-menu-entry="upload-file"]').should('not.be.visible')
-			cy.get('[data-cy-upload-picker-menu-entry="empty-file"]').should('not.be.visible')
-
-			cy.get('@component').then((component) => {
-				component.setDestination(new Folder({
-					id: 56,
-					owner: 'user',
-					source: generateRemoteUrl('dav/files/user/Folder'),
-					permissions: Permission.NONE,
-					root: '/files/user',
-				}))
+			cy.mount(UploadPicker, { propsData }).then(({ component }) => {
+				const instance = component as InstanceType<typeof UploadPicker>
+
+				// Check and init aliases
+				cy.get('[data-cy-upload-picker] [data-cy-upload-picker-input]').as('input').should('exist')
+				cy.get('[data-cy-upload-picker] .upload-picker__progress').as('progress').should('exist')
+				cy.get('[data-cy-upload-picker] .action-item__menutoggle').should('exist')
+
+				cy.get('[data-cy-upload-picker] .action-item__menutoggle').click()
+				cy.get('[data-cy-upload-picker-menu-entry="upload-file"]').should('have.length', 1)
+				cy.get('[data-cy-upload-picker-menu-entry="empty-file"]').should('have.length', 1)
+
+				// Close menu
+				cy.get('body').click()
+				cy.get('[data-cy-upload-picker-menu-entry="upload-file"]').should('not.be.visible')
+				cy.get('[data-cy-upload-picker-menu-entry="empty-file"]').should('not.be.visible')
+
+				// Change context when we're sure the menu is closed
+				cy.get('[role="menu"]').should('not.be.visible')
+					.then(() => {
+						instance.setDestination(new Folder({
+							id: 56,
+							owner: 'user',
+							source: generateRemoteUrl('dav/files/user/Folder'),
+							permissions: Permission.NONE,
+							root: '/files/user',
+						}))
+					})
+
+				// Menu should not be visible anymore
+				cy.get('[data-cy-upload-picker] .action-item__menutoggle').should('not.exist')
+				cy.get('[data-cy-upload-picker-menu-entry="upload-file"]').should('have.length', 1)
+				cy.get('[data-cy-upload-picker-menu-entry="empty-file"]').should('not.exist')
 			})
-
-			// Menu should not be visible anymore
-			cy.get('[data-cy-upload-picker] .action-item__menutoggle')
-				.as('menuButton')
-				.should('not.exist')
-			cy.get('[data-cy-upload-picker-menu-entry="upload-file"]').should('have.length', 1)
-			cy.get('[data-cy-upload-picker-menu-entry="empty-file"]').should('not.exist')
 		})
 	})
 })
diff --git a/cypress/support/component.ts b/cypress/support/component.ts
index 43d5fc72..6d04272b 100644
--- a/cypress/support/component.ts
+++ b/cypress/support/component.ts
@@ -32,38 +32,11 @@ window._oc_capabilities = { files: {} }
 
 // Example use:
 // cy.mount(MyComponent)
-Cypress.Commands.add('mount', (component, optionsOrProps) => {
-	let instance = null
+Cypress.Commands.add('mount', (component, options = {}) => {
+	// Setup options object
+	options.extensions = options.extensions || {}
+	options.extensions.plugins = options.extensions.plugins || []
+	options.extensions.components = options.extensions.components || {}
 
-	// Add our mounted method to expose the component instance to cypress
-
-	// Support old vue 2 options
-	if (component.options) {
-		if (!component.options.mounted) {
-			component.options.mounted = []
-		}
-		component.options.mounted.push(function() {
-			instance = this
-		})
-	}
-
-	// Support new vue 3 options
-	if (typeof component?.mounted !== 'function') {
-		component.mounted = function() {
-			instance = this
-		}
-	} else {
-		// If the component already has a mounted method, we need to chain them
-		const originalMounted = component.mounted
-		component.mounted = function() {
-			originalMounted.call(this)
-			instance = this
-		}
-	}
-
-	// Expose the component with cy.get('@component')
-	const mounted = mount(component, optionsOrProps).then(() => {
-		cy.wrap(instance).as('component')
-		return mounted
-	})
+	return mount(component, options)
 })
diff --git a/lib/components/UploadPicker.vue b/lib/components/UploadPicker.vue
index bc297e6a..bc8621a0 100644
--- a/lib/components/UploadPicker.vue
+++ b/lib/components/UploadPicker.vue
@@ -9,7 +9,7 @@
 		class="upload-picker"
 		data-cy-upload-picker>
 		<!-- New button -->
-		<NcButton v-if="(noMenu || newFileMenuEntries.length === 0) && !canUploadFolders"
+		<NcButton v-if="!haveMenu"
 			:disabled="disabled"
 			data-cy-upload-picker-add
 			data-cy-upload-picker-menu-entry="upload-file"
@@ -20,9 +20,11 @@
 			</template>
 			{{ buttonName }}
 		</NcButton>
+
 		<NcActions v-else
 			:aria-label="buttonLabel"
 			:menu-name="buttonName"
+			:open.sync="openedMenu"
 			type="secondary">
 			<template #icon>
 				<IconPlus :size="20" />
@@ -142,9 +144,11 @@ import type { Entry, Node } from '@nextcloud/files'
 import type { PropType } from 'vue'
 import type { Upload } from '../upload.ts'
 
+import { defineComponent } from 'vue'
 import { Folder, NewMenuEntryCategory, getNewFileMenuEntries } from '@nextcloud/files'
+// @ts-expect-error missing types
+import { useHotKey } from '@nextcloud/vue/dist/Composables/useHotKey.js'
 import makeEta from 'simple-eta'
-import Vue from 'vue'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcActionCaption from '@nextcloud/vue/dist/Components/NcActionCaption.js'
@@ -163,10 +167,10 @@ import { getUploader } from '../index.ts'
 import { Status } from '../uploader.ts'
 import { Status as UploadStatus } from '../upload.ts'
 import { t } from '../utils/l10n.ts'
-import logger from '../utils/logger.ts'
 import { uploadConflictHandler } from '../utils/conflicts.ts'
+import logger from '../utils/logger.ts'
 
-export default Vue.extend({
+export default defineComponent({
 	name: 'UploadPicker',
 
 	components: {
@@ -199,7 +203,6 @@ export default Vue.extend({
 
 		/**
 		 * Allow to disable the "new"-menu for this UploadPicker instance
-		 * @default false
 		 */
 		noMenu: {
 			type: Boolean,
@@ -245,7 +248,8 @@ export default Vue.extend({
 
 	data() {
 		return {
-			eta: null,
+			eta: null as null|ReturnType<typeof makeEta>,
+			openedMenu: false,
 			timeLeft: '',
 
 			newFileMenuEntries: [] as Entry[],
@@ -254,65 +258,69 @@ export default Vue.extend({
 	},
 
 	computed: {
-		menuEntriesUpload() {
+		menuEntriesUpload(): Entry[] {
 			return this.newFileMenuEntries.filter((entry) => entry.category === NewMenuEntryCategory.UploadFromDevice)
 		},
 
-		menuEntriesNew() {
+		menuEntriesNew(): Entry[] {
 			return this.newFileMenuEntries.filter((entry) => entry.category === NewMenuEntryCategory.CreateNew)
 		},
 
-		menuEntriesOther() {
+		menuEntriesOther(): Entry[] {
 			return this.newFileMenuEntries.filter((entry) => entry.category === NewMenuEntryCategory.Other)
 		},
 		/**
 		 * Check whether the current browser supports uploading directories
 		 * Hint: This does not check if the current connection supports this, as some browsers require a secure context!
 		 */
-		canUploadFolders() {
+		canUploadFolders(): boolean {
 			return this.allowFolders && 'webkitdirectory' in document.createElement('input')
 		},
 
-		totalQueueSize() {
+		totalQueueSize(): number {
 			return this.uploadManager.info?.size || 0
 		},
 
-		uploadedQueueSize() {
+		uploadedQueueSize(): number {
 			return this.uploadManager.info?.progress || 0
 		},
 
-		progress() {
+		progress(): number {
 			return Math.round(this.uploadedQueueSize / this.totalQueueSize * 100) || 0
 		},
 
-		queue() {
-			return this.uploadManager.queue
+		queue(): Upload[] {
+			return this.uploadManager.queue as Upload[]
 		},
 
-		hasFailure() {
+		hasFailure(): boolean {
 			return this.queue?.filter((upload: Upload) => upload.status === UploadStatus.FAILED).length !== 0
 		},
-		isUploading() {
+		isUploading(): boolean {
 			return this.queue?.length > 0
 		},
-		isAssembling() {
+		isAssembling(): boolean {
 			return this.queue?.filter((upload: Upload) => upload.status === UploadStatus.ASSEMBLING).length !== 0
 		},
-		isPaused() {
+		isPaused(): boolean {
 			return this.uploadManager.info?.status === Status.PAUSED
 		},
 
-		buttonLabel() {
+		buttonLabel(): string {
 			return this.noMenu ? t('Upload') : t('New')
 		},
 
 		// Hide the button text if we're uploading
-		buttonName() {
+		buttonName(): string|undefined {
 			if (this.isUploading) {
 				return undefined
 			}
 			return this.buttonLabel
 		},
+
+		haveMenu(): boolean {
+			return !((this.noMenu || this.newFileMenuEntries.length === 0) && !this.canUploadFolders)
+		},
 	},
 
 	watch: {
@@ -357,6 +365,18 @@ export default Vue.extend({
 		// Update data on upload progress
 		this.uploadManager.addNotifier(this.onUploadCompletion)
 
+		// Register hotkeys
+		useHotKey('u', this.onKeyDown, {
+			stop: true,
+			prevent: true,
+			shift: true,
+		})
+
+		useHotKey('Escape', this.onKeyDown, {
+			stop: true,
+			prevent: true,
+		})
+
 		logger.debug('UploadPicker initialised')
 	},
 
@@ -394,7 +414,6 @@ export default Vue.extend({
 			return Array.isArray(this.content) ? this.content : await this.content(path)
 		},
 
-
 		/**
 		 * Start uploading
 		 */
@@ -468,6 +487,24 @@ export default Vue.extend({
 				this.$emit('uploaded', upload)
 			}
 		},
+
+		onKeyDown(event: KeyboardEvent) {
+			// Shift + u opens the menu
+			if (event.key === 'u') {
+				// If we have a menu, open it
+				if (this.haveMenu) {
+					this.openedMenu = true
+					return
+				}
+
+				// Otherwise, trigger the default action
+				this.onTriggerPick()
+			}
+
+			if (event.key === 'Escape' && this.openedMenu) {
+				this.openedMenu = false
+			}
+		},
 	},
 })
 </script>
diff --git a/lib/index.ts b/lib/index.ts
index 437653e6..a088ea91 100644
--- a/lib/index.ts
+++ b/lib/index.ts
@@ -7,8 +7,8 @@ import type { AsyncComponent } from 'vue'
 
 import { isPublicShare } from '@nextcloud/sharing/public'
 import Vue, { defineAsyncComponent } from 'vue'
-import { Uploader } from './uploader'
 
+import { Uploader } from './uploader'
 import UploadPicker from './components/UploadPicker.vue'
 
 export type { IDirectory, Directory } from './utils/fileTree'
diff --git a/lib/uploader.ts b/lib/uploader.ts
index 310c77e3..59bfa3ae 100644
--- a/lib/uploader.ts
+++ b/lib/uploader.ts
@@ -10,6 +10,7 @@ import { getCurrentUser } from '@nextcloud/auth'
 import { FileType, Folder, Permission, davGetClient, davRemoteURL, davRootPath } from '@nextcloud/files'
 import { encodePath } from '@nextcloud/paths'
 import { normalize } from 'path'
+import { getCapabilities } from '@nextcloud/capabilities'
 
 import axios, { isCancel } from '@nextcloud/axios'
 import PCancelable from 'p-cancelable'
@@ -22,7 +23,6 @@ import { isFileSystemFileEntry } from './utils/filesystem.js'
 import { Directory } from './utils/fileTree.js'
 import { t } from './utils/l10n.js'
 import logger from './utils/logger.js'
-import { getCapabilities } from '@nextcloud/capabilities'
 
 export enum Status {
 	IDLE = 0,
diff --git a/lib/utils/upload.ts b/lib/utils/upload.ts
index dfc33a7c..c94251f2 100644
--- a/lib/utils/upload.ts
+++ b/lib/utils/upload.ts
@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import type { AxiosProgressEvent, AxiosResponse } from 'axios'
+import type { AxiosProgressEvent, AxiosResponse, AxiosError } from 'axios'
 import { generateRemoteUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
 import axios from '@nextcloud/axios'
@@ -62,7 +62,7 @@ export const uploadData = async function(
 		headers,
 		'axios-retry': {
 			retries,
-			retryDelay: (retryCount, error) => exponentialDelay(retryCount, error, 1000),
+			retryDelay: (retryCount: number, error: AxiosError) => exponentialDelay(retryCount, error, 1000),
 		},
 	})
 }
@@ -100,7 +100,7 @@ export const initChunkWorkspace = async function(destinationFile: string | undef
 		headers,
 		'axios-retry': {
 			retries,
-			retryDelay: (retryCount, error) => exponentialDelay(retryCount, error, 1000),
+			retryDelay: (retryCount: number, error: AxiosError) => exponentialDelay(retryCount, error, 1000),
 		},
 	})