diff --git a/src/components/board/Stack.vue b/src/components/board/Stack.vue
index a9879fc72..60ddffa82 100644
--- a/src/components/board/Stack.vue
+++ b/src/components/board/Stack.vue
@@ -118,6 +118,7 @@
 						:placeholder="t('deck', 'Card name')"
 						required
 						pattern=".*\S+.*"
+						@focus="onCreateCardFocus"
 						@keydown.esc="stopCardCreation">
 					<input v-show="!stateCardCreating"
 						class="icon-confirm"
@@ -229,6 +230,13 @@ export default {
 			},
 		},
 	},
+	watch: {
+		showAddCard(newValue) {
+			if (!newValue) {
+				this.$store.dispatch('toggleShortcutLock', false)
+			}
+		},
+	},
 
 	methods: {
 		stopCardCreation(e) {
@@ -318,6 +326,9 @@ export default {
 				this.stateCardCreating = false
 			}
 		},
+		onCreateCardFocus() {
+			this.$store.dispatch('toggleShortcutLock', true)
+		},
 	},
 }
 </script>
diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index da3708f5c..11b5754da 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -130,6 +130,7 @@ export default {
 			showArchived: state => state.showArchived,
 			currentBoard: state => state.currentBoard,
 			showCardCover: state => state.showCardCover,
+			shortcutLock: state => state.shortcutLock,
 		}),
 		...mapGetters([
 			'isArchived',
@@ -205,6 +206,9 @@ export default {
 	},
 	methods: {
 		focus(card) {
+			if (this.shortcutLock) {
+				return
+			}
 			card = this.$refs[`card${card}`]
 			card.focus()
 		},