diff --git a/src/components/board/Stack.vue b/src/components/board/Stack.vue
index 2bfd73200..782d4255e 100644
--- a/src/components/board/Stack.vue
+++ b/src/components/board/Stack.vue
@@ -84,8 +84,8 @@
 						:disabled="stateCardCreating"
 						:placeholder="t('deck', 'Card name')"
 						required
+						pattern=".*\S+.*"
 						@keydown.esc="stopCardCreation">
-
 					<input v-show="!stateCardCreating"
 						class="icon-confirm"
 						type="submit"
diff --git a/src/components/card/CardSidebar.vue b/src/components/card/CardSidebar.vue
index deee23875..6f08d01ac 100644
--- a/src/components/card/CardSidebar.vue
+++ b/src/components/card/CardSidebar.vue
@@ -227,6 +227,7 @@ import {
 	getMonthNamesShort,
 } from '@nextcloud/l10n'
 import moment from '@nextcloud/moment'
+import { showError } from '@nextcloud/dialogs'
 
 const markdownIt = new MarkdownIt({
 	linkify: true,
@@ -464,6 +465,10 @@ export default {
 			this.descriptionSaving = false
 		},
 		updateTitle(newTitle) {
+			if (newTitle.trim === '') {
+				showError('Could not update card title')
+				return
+			}
 			this.$set(this.copiedCard, 'title', newTitle)
 			this.$store.dispatch('updateCardTitle', this.copiedCard).then(() => {
 				this.titleEditable = false
diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index fd74ec6d9..de54cc705 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -43,8 +43,12 @@
 					class="dragDisabled"
 					@keyup.esc="cancelEdit"
 					@submit.prevent="finishedEdit(card)">
-					<input v-model="copiedCard.title" v-focus type="text">
-					<input type="button" class="icon-confirm" @click="finishedEdit(card)">
+					<input v-model="copiedCard.title"
+						v-focus
+						type="text"
+						required
+						pattern=".*\S+.*">
+					<input type="submit" value="" class="icon-confirm">
 				</form>
 
 				<DueDate v-if="!editing" :card="card" />