diff --git a/src/components/board/Board.vue b/src/components/board/Board.vue
index 145b3e11c..4cddc8445 100644
--- a/src/components/board/Board.vue
+++ b/src/components/board/Board.vue
@@ -53,9 +53,11 @@
 				<Container lock-axix="y"
 					orientation="horizontal"
 					:drag-handle-selector="dragHandleSelector"
+					@drag-start="draggingStack = true"
+					@drag-end="draggingStack = false"
 					@drop="onDropStack">
 					<Draggable v-for="stack in stacksByBoard" :key="stack.id">
-						<Stack :stack="stack" />
+						<Stack :stack="stack" :dragging="draggingStack" />
 					</Draggable>
 				</Container>
 			</div>
@@ -100,6 +102,7 @@ export default {
 	},
 	data() {
 		return {
+			draggingStack: false,
 			loading: true,
 			newStackTitle: '',
 		}
diff --git a/src/components/board/Stack.vue b/src/components/board/Stack.vue
index c99af30f3..a845ba628 100644
--- a/src/components/board/Stack.vue
+++ b/src/components/board/Stack.vue
@@ -171,6 +171,10 @@ export default {
 		ClickOutside,
 	},
 	props: {
+		dragging: {
+			type: Boolean,
+			default: false,
+		},
 		stack: {
 			type: Object,
 			default: undefined,
@@ -270,6 +274,10 @@ export default {
 			this.modalArchivAllCardsShow = false
 		},
 		startEditing(stack) {
+			if (this.dragging) {
+			  return
+			}
+
 			this.copiedStack = Object.assign({}, stack)
 			this.editing = true
 		},