diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 40ffb0f489..da85abddb3 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -131,9 +131,9 @@ Cypress.Commands.add("navigateToFrontend", () => {
 
 Cypress.Commands.add("createScreen", (screenName, route) => {
   cy.get(".newscreen").click()
-  cy.get(".uk-input:first").type(screenName)
+  cy.get("[data-cy=new-screen-dialog] input:first").type(screenName)
   if (route) {
-    cy.get(".uk-input:last").type(route)
+    cy.get("[data-cy=new-screen-dialog] input:last").type(route)
   }
   cy.get(".uk-modal-footer").within(() => {
     cy.contains("Create Screen").click()
diff --git a/packages/builder/src/components/userInterface/NewScreen.svelte b/packages/builder/src/components/userInterface/NewScreen.svelte
index ab2b31b589..b1963bd3f5 100644
--- a/packages/builder/src/components/userInterface/NewScreen.svelte
+++ b/packages/builder/src/components/userInterface/NewScreen.svelte
@@ -79,7 +79,7 @@
   onOk={save}
   okText="Create Screen">
 
-  <div>
+  <div data-cy="new-screen-dialog">
     <div class="uk-margin">
       <Input label="Name" bind:value={name} />
     </div>