diff --git a/apps/builder/components/shared/Graph/Nodes/ItemNode/ItemNodesList.tsx b/apps/builder/components/shared/Graph/Nodes/ItemNode/ItemNodesList.tsx
index 18fc20c53..ff736ed8c 100644
--- a/apps/builder/components/shared/Graph/Nodes/ItemNode/ItemNodesList.tsx
+++ b/apps/builder/components/shared/Graph/Nodes/ItemNode/ItemNodesList.tsx
@@ -72,12 +72,12 @@ export const ItemNodesList = ({
     if (!isDraggingOnCurrentBlock) return
     const itemIndex = computeNearestPlaceholderIndex(e.pageY, placeholderRefs)
     e.stopPropagation()
+    setDraggedItem(undefined)
     createItem(draggedItem as ButtonItem, {
       blockIndex,
       stepIndex,
       itemIndex,
     })
-    setDraggedItem(undefined)
   }
   useEventListener(
     'mouseup',
diff --git a/apps/builder/contexts/TypebotContext/actions/steps.ts b/apps/builder/contexts/TypebotContext/actions/steps.ts
index 04cf96bde..0e87d19d0 100644
--- a/apps/builder/contexts/TypebotContext/actions/steps.ts
+++ b/apps/builder/contexts/TypebotContext/actions/steps.ts
@@ -117,9 +117,8 @@ const moveStepToBlock = (
   const items = stepHasItems(step) ? step.items : []
   items.forEach((item) => {
     const edgeIndex = typebot.edges.findIndex(byId(item.outgoingEdgeId))
-    edgeIndex !== -1
-      ? (typebot.edges[edgeIndex].from.blockId = blockId)
-      : (newStep.outgoingEdgeId = undefined)
+    if (edgeIndex === -1) return
+    typebot.edges[edgeIndex].from.blockId = blockId
   })
   if (step.outgoingEdgeId) {
     if (typebot.blocks[blockIndex].steps.length > stepIndex ?? 0) {