diff --git a/packages/frontend/editor-ui/src/components/Draggable.vue b/packages/frontend/editor-ui/src/components/Draggable.vue
index ea4a79a120..9d17362584 100644
--- a/packages/frontend/editor-ui/src/components/Draggable.vue
+++ b/packages/frontend/editor-ui/src/components/Draggable.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { DraggableMode, XYPosition } from '@/Interface';
 import { isPresent } from '@/utils/typesUtils';
-import { type StyleValue, computed, ref } from 'vue';
+import { type StyleValue, computed, onBeforeUnmount, ref } from 'vue';
 
 type Props = {
 	type: DraggableMode;
@@ -113,8 +113,14 @@ const onDragEnd = () => {
 		if (draggingElement.value) emit('dragend', draggingElement.value);
 		isDragging.value = false;
 		draggingElement.value = undefined;
-	}, 0);
+	});
 };
+
+onBeforeUnmount(() => {
+	if (draggingElement.value) {
+		emit('dragend', draggingElement.value);
+	}
+});
 </script>
 
 <template>