diff --git a/src/components/organisms/BrowserWindow.tsx b/src/components/organisms/BrowserWindow.tsx
index fea437bc..f848f28a 100644
--- a/src/components/organisms/BrowserWindow.tsx
+++ b/src/components/organisms/BrowserWindow.tsx
@@ -228,14 +228,15 @@ export const BrowserWindow = () => {
                         setFields(prevFields => {
                             const updatedFields = {
                                 ...prevFields,
-                                [newField.label]: newField
+                                [newField.id]: newField
                             };
-                            if (listSelector) {
-                                addListStep(listSelector, updatedFields, currentListId, { type: '', selector: paginationSelector });
-                            }
                             return updatedFields;
                         });
 
+                        if (listSelector) {
+                            addListStep(listSelector, { ...fields, [newField.id]: newField }, currentListId, { type: '', selector: paginationSelector });
+                        }
+
                     } else {
                         setAttributeOptions(options);
                         setSelectedElement({
@@ -286,13 +287,14 @@ export const BrowserWindow = () => {
                     setFields(prevFields => {
                         const updatedFields = {
                             ...prevFields,
-                            [newField.label]: newField
+                            [newField.id]: newField
                         };
-                        if (listSelector) {
-                            addListStep(listSelector, updatedFields, currentListId, { type: '', selector: paginationSelector });
-                        }
                         return updatedFields;
                     });
+
+                    if (listSelector) {
+                        addListStep(listSelector, { ...fields, [newField.id]: newField }, currentListId, { type: '', selector: paginationSelector });
+                    }
                 }
             }
         }