diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index 1052577a8..6ad02ef50 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -42,9 +42,10 @@
 					<label for="new-stack-input-main" class="hidden-visually">Add a new stack</label>
 					<input id="new-stack-input-main" v-model="newStackTitle" type="text"
 						class="no-close"
-						placeholder="Add a new stack">
+						placeholder="Add a new stack" required>
 					<input v-tooltip="t('deck', 'clickAddNewStack')" class="icon-confirm" type="submit"
 						value="">
+
 				</form>
 			</div>
 			<div class="board-action-buttons">
@@ -75,7 +76,8 @@ export default {
 		return {
 			newStackTitle: '',
 			stack: '',
-			showArchived: false
+			showArchived: false,
+			missingStackName: t('deck', 'stack title must be provided')
 		}
 	},
 	computed: {
@@ -88,6 +90,13 @@ export default {
 				return 'opacity: 1.0'
 			}
 			return 'opacity: 0.3'
+		},
+		addNewStackValidation() {
+			if (this.newStackTitle === '') {
+				return false
+			}
+
+			return true
 		}
 	},
 	methods: {
diff --git a/src/components/board/Stack.vue b/src/components/board/Stack.vue
index d4ea85050..824a1e183 100644
--- a/src/components/board/Stack.vue
+++ b/src/components/board/Stack.vue
@@ -49,7 +49,11 @@
 			<input id="new-stack-input-main" v-model="newCardTitle" type="text"
 				class="no-close"
 				placeholder="Add a new card">
-			<input v-tooltip="t('deck', 'Create a new card')" class="icon-confirm" type="submit"
+
+			<input v-tooltip="{content: missingCardName, show: !addNewCardValidation, trigger: 'manual' }"
+				:disabled="!addNewCardValidation"
+				class="icon-confirm"
+				type="submit"
 				value="">
 		</form>
 
@@ -83,12 +87,20 @@ export default {
 		return {
 			editing: false,
 			copiedStack: '',
-			newCardTitle: ''
+			newCardTitle: '',
+			missingCardName: t('deck', 'card title must be provided')
 		}
 	},
 	computed: {
 		cardsByStack() {
 			return (id) => this.$store.getters.cardsByStack(id)
+		},
+		addNewCardValidation() {
+			if (this.newCardTitle === '') {
+				return false
+			}
+
+			return true
 		}
 	},
 
@@ -121,6 +133,7 @@ export default {
 				boardId: this.stack.boardId
 			}
 			this.$store.dispatch('addCard', newCard)
+			this.newCardTitle = ''
 		}
 	}
 }