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 00a0e13ee..04b30dbbe 100644
--- a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemNode.tsx
+++ b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemNode.tsx
@@ -9,7 +9,7 @@ import {
 import { PlusIcon } from '@/components/icons'
 import { useTypebot } from '@/features/editor'
 import { ButtonItem, ItemIndices, ItemType } from 'models'
-import React, { useEffect, useRef, useState } from 'react'
+import React, { useRef, useState } from 'react'
 import { isNotDefined } from 'utils'
 
 type Props = {
@@ -20,16 +20,9 @@ type Props = {
 
 export const ButtonsItemNode = ({ item, indices, isMouseOver }: Props) => {
   const { deleteItem, updateItem, createItem } = useTypebot()
-  const [initialContent] = useState(item.content ?? '')
   const [itemValue, setItemValue] = useState(item.content ?? 'Click to edit')
   const editableRef = useRef<HTMLDivElement | null>(null)
 
-  useEffect(() => {
-    if (itemValue !== item.content)
-      setItemValue(item.content ?? 'Click to edit')
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [item])
-
   const handleInputSubmit = () => {
     if (itemValue === '') deleteItem(indices)
     else
@@ -38,7 +31,7 @@ export const ButtonsItemNode = ({ item, indices, isMouseOver }: Props) => {
 
   const handleKeyPress = (e: React.KeyboardEvent<HTMLDivElement>) => {
     if (e.key === 'Escape' && itemValue === 'Click to edit') deleteItem(indices)
-    if (e.key === 'Enter' && itemValue !== '' && initialContent === '')
+    if (e.key === 'Enter' && itemValue !== '' && itemValue !== 'Click to edit')
       handlePlusClick()
   }
 
diff --git a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContent/ItemNodeContent.tsx b/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContent/ItemNodeContent.tsx
index 6a0b4af0e..8bdcbac4d 100644
--- a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContent/ItemNodeContent.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContent/ItemNodeContent.tsx
@@ -14,6 +14,7 @@ export const ItemNodeContent = ({ item, indices, isMouseOver }: Props) => {
     case ItemType.BUTTON:
       return (
         <ButtonsItemNode
+          key={item.content}
           item={item}
           isMouseOver={isMouseOver}
           indices={indices}