diff --git a/packages/web/src/components/ControlledAutocomplete/index.tsx b/packages/web/src/components/ControlledAutocomplete/index.tsx
index d3f29059..198ff396 100644
--- a/packages/web/src/components/ControlledAutocomplete/index.tsx
+++ b/packages/web/src/components/ControlledAutocomplete/index.tsx
@@ -96,6 +96,11 @@ function ControlledAutocomplete(
             }}
             ref={ref}
             data-test={`${name}-autocomplete`}
+            renderOption={(optionProps, option) => (
+              <li {...optionProps} key={option.value.toString()}>
+                {option.label}
+              </li>
+            )}
           />
 
           <FormHelperText
diff --git a/packages/web/src/components/Editor/index.tsx b/packages/web/src/components/Editor/index.tsx
index 36d543cc..90e42378 100644
--- a/packages/web/src/components/Editor/index.tsx
+++ b/packages/web/src/components/Editor/index.tsx
@@ -116,7 +116,7 @@ export default function Editor(props: EditorProps): React.ReactElement {
       gap={1}
     >
       {flow?.steps?.map((step, index, steps) => (
-        <React.Fragment key={`${step}-${index}`}>
+        <React.Fragment key={`${step.id}-${index}`}>
           <FlowStep
             key={step.id}
             step={step}