diff --git a/cypress/e2e/layers.cy.ts b/cypress/e2e/layers.cy.ts
index 71b37e90..d59f9eed 100644
--- a/cypress/e2e/layers.cy.ts
+++ b/cypress/e2e/layers.cy.ts
@@ -266,7 +266,7 @@ describe("layers", () => {
           beforeEach(() => {
             bgId = createBackground();
             when.click("layer-list-item:background:" + bgId);
-            when.click("spec-field:background-color", 0);
+            when.click("spec-field:background-color");
           });
 
           it("should update style in local storage", () => {
diff --git a/src/components/FieldFunction.tsx b/src/components/FieldFunction.tsx
index 4ef904eb..1cf17036 100644
--- a/src/components/FieldFunction.tsx
+++ b/src/components/FieldFunction.tsx
@@ -399,7 +399,7 @@ export default class FieldFunction extends React.Component<FieldFunctionProps, F
         />
       )
     }
-    return <div className={propClass} data-wd-key={"spec-field:"+this.props.fieldName}>
+    return <div className={propClass} data-wd-key={"spec-field-container:"+this.props.fieldName}>
       {specField}
     </div>
   }