diff --git a/core/src/views/UnifiedSearch.vue b/core/src/views/UnifiedSearch.vue
index fc1d456247c..38b18814665 100644
--- a/core/src/views/UnifiedSearch.vue
+++ b/core/src/views/UnifiedSearch.vue
@@ -97,7 +97,9 @@ export default defineComponent({
 
 	mounted() {
 		// register keyboard listener for search shortcut
-		window.addEventListener('keydown', this.onKeyDown)
+		if (window.OCP.Accessibility.disableKeyboardShortcuts() === false) {
+			window.addEventListener('keydown', this.onKeyDown)
+		}
 
 		// Allow external reset of the search / close local search
 		subscribe('nextcloud:unified-search:reset', () => {
@@ -131,9 +133,9 @@ export default defineComponent({
 			if (event.ctrlKey && event.code === 'KeyF') {
 				// only handle search if not already open - in this case the browser native search should be used
 				if (!this.showLocalSearch && !this.showUnifiedSearch) {
-					this.toggleUnifiedSearch()
 					event.preventDefault()
 				}
+				this.toggleUnifiedSearch()
 			}
 		},
 
@@ -142,9 +144,10 @@ export default defineComponent({
 		 */
 		toggleUnifiedSearch() {
 			if (this.supportsLocalSearch) {
-				this.showLocalSearch = true
+				this.showLocalSearch = !this.showLocalSearch
 			} else {
-				this.openModal()
+				this.showUnifiedSearch = !this.showUnifiedSearch
+				this.showLocalSearch = false
 			}
 		},