diff --git a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemNode.tsx b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemNode.tsx
index b495bc575..c1e6a1f2b 100644
--- a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemNode.tsx
+++ b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemNode.tsx
@@ -85,7 +85,7 @@ export const ButtonsItemNode = ({ item, indices, isMouseOver }: Props) => {
               color={item.content !== 'Click to edit' ? 'inherit' : 'gray.500'}
               cursor="pointer"
             />
-            <EditableInput />
+            <EditableInput onMouseDownCapture={(e) => e.stopPropagation()} />
           </Editable>
           <HitboxExtension />
           <SlideFade
diff --git a/apps/builder/src/features/graph/components/nodes/item/ItemNodesList.tsx b/apps/builder/src/features/graph/components/nodes/item/ItemNodesList.tsx
index c2546188c..7a086036d 100644
--- a/apps/builder/src/features/graph/components/nodes/item/ItemNodesList.tsx
+++ b/apps/builder/src/features/graph/components/nodes/item/ItemNodesList.tsx
@@ -114,7 +114,10 @@ export const ItemNodesList = ({
       detachItemFromBlock({ groupIndex, blockIndex, itemIndex })
       setPosition(absolute)
       setRelativeCoordinates(relative)
-      setDraggedItem(item)
+      setDraggedItem({
+        ...item,
+        blockId: block.id,
+      })
     }
 
   const stopPropagating = (e: React.MouseEvent) => e.stopPropagation()