diff --git a/src/components/board/Stack.vue b/src/components/board/Stack.vue
index 749f3850a..cb53980d1 100644
--- a/src/components/board/Stack.vue
+++ b/src/components/board/Stack.vue
@@ -68,6 +68,7 @@
 
 		<Container :get-child-payload="payloadForCard(stack.id)"
 			group-name="stack"
+			non-drag-area-selector=".dragDisabled"
 			:drag-handle-selector="dragHandleSelector"
 			@should-accept-drop="canEdit"
 			@drop="($event) => onDropCard(stack.id, $event)">
diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index 6ab96426d..e6029b5c1 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -41,6 +41,7 @@
 			</h3>
 			<form v-if="editing"
 				v-click-outside="cancelEdit"
+				class="dragDisabled"
 				@keyup.esc="cancelEdit"
 				@submit.prevent="finishedEdit(card)">
 				<input v-model="copiedCard.title" type="text" autofocus>