diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index b1a89c003..c56b30e6c 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -31,17 +31,6 @@
 		<div class="board-actions">
 			<SessionList v-if="isNotifyPushEnabled && presentUsers.length"
 				:sessions="presentUsers" />
-			<div v-if="searchQuery || true" class="deck-search">
-				<input id="deck-search-input"
-					ref="search"
-					:tabindex="0"
-					type="search"
-					class="icon-search"
-					:value="searchQuery"
-					@focus="$store.dispatch('toggleShortcutLock', true)"
-					@blur="$store.dispatch('toggleShortcutLock', false)"
-					@input="$store.commit('setSearchQuery', $event.target.value)">
-			</div>
 			<div v-if="board && canManage && !showArchived && !board.archived"
 				id="stack-add"
 				v-click-outside="hideAddStack">
@@ -324,7 +313,6 @@ export default {
 			isFullApp: state => state.isFullApp,
 			compactMode: state => state.compactMode,
 			showCardCover: state => state.showCardCover,
-			searchQuery: state => state.searchQuery,
 		}),
 		detailsRoute() {
 			return {
@@ -454,9 +442,6 @@ export default {
 		triggerOpenFilters() {
 			this.$refs.filterPopover.$el.click()
 		},
-		triggerOpenSearch() {
-			this.$refs.search.focus()
-		},
 		triggerClearFilter() {
 			this.clearFilter()
 		},
@@ -525,16 +510,6 @@ export default {
 		display: flex;
 	}
 
-	.deck-search {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		input[type=search] {
-			background-position: 5px;
-			padding-left: 24px !important;
-		}
-	}
-
 	.filter--item {
 		input + label {
 			display: block;
diff --git a/src/components/KeyboardShortcuts.vue b/src/components/KeyboardShortcuts.vue
index 7be5e6e40..d737dc32a 100644
--- a/src/components/KeyboardShortcuts.vue
+++ b/src/components/KeyboardShortcuts.vue
@@ -67,17 +67,6 @@ export default {
 				return
 			}
 
-			// Global shortcuts (not board specific)
-			if ((key.metaKey || key.ctrlKey) && key.code === 'KeyF') {
-				const searchInput = document.getElementById('deck-search-input')
-				if (searchInput === document.activeElement) {
-					return false
-				}
-
-				document.getElementById('deck-search-input').focus()
-				key.preventDefault()
-				return true
-			}
 			if (key.code === 'Minus') {
 				emit('deck:global:toggle-help-dialog')
 				return