diff --git a/apps/builder/src/features/folders/components/FolderButton.tsx b/apps/builder/src/features/folders/components/FolderButton.tsx
index 4e61f547d..81f05c02d 100644
--- a/apps/builder/src/features/folders/components/FolderButton.tsx
+++ b/apps/builder/src/features/folders/components/FolderButton.tsx
@@ -192,5 +192,8 @@ export const ButtonSkeleton = () => (
 
 export default memo(
   FolderButton,
-  (prev, next) => prev.folder.id === next.folder.id && prev.index === next.index
+  (prev, next) =>
+    prev.folder.id === next.folder.id &&
+    prev.index === next.index &&
+    prev.folder.name === next.folder.name
 )
diff --git a/apps/builder/src/features/folders/components/FolderContent.tsx b/apps/builder/src/features/folders/components/FolderContent.tsx
index 0ba58ca8d..7a67d67bc 100644
--- a/apps/builder/src/features/folders/components/FolderContent.tsx
+++ b/apps/builder/src/features/folders/components/FolderContent.tsx
@@ -194,7 +194,7 @@ export const FolderContent = ({ folder }: Props) => {
             {folders &&
               folders.map((folder, index) => (
                 <FolderButton
-                  key={folder.id.toString()}
+                  key={folder.id}
                   index={index}
                   folder={folder}
                   onFolderDeleted={refetchFolders}
@@ -205,7 +205,7 @@ export const FolderContent = ({ folder }: Props) => {
             {typebots &&
               typebots.map((typebot) => (
                 <TypebotButton
-                  key={typebot.id.toString()}
+                  key={typebot.id}
                   typebot={typebot}
                   draggedTypebot={draggedTypebot}
                   onTypebotUpdated={refetchTypebots}
diff --git a/apps/builder/src/features/folders/components/TypebotButton.tsx b/apps/builder/src/features/folders/components/TypebotButton.tsx
index 13b9d9e69..14046c211 100644
--- a/apps/builder/src/features/folders/components/TypebotButton.tsx
+++ b/apps/builder/src/features/folders/components/TypebotButton.tsx
@@ -240,5 +240,8 @@ export default memo(
   (prev, next) =>
     prev.draggedTypebot?.id === next.draggedTypebot?.id &&
     prev.typebot.id === next.typebot.id &&
-    prev.isReadOnly === next.isReadOnly
+    prev.isReadOnly === next.isReadOnly &&
+    prev.typebot.name === next.typebot.name &&
+    prev.typebot.icon === next.typebot.icon &&
+    prev.typebot.publishedTypebotId === next.typebot.publishedTypebotId
 )