diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json
index 0908f2c839..669ee5af34 100644
--- a/packages/builder/cypress.json
+++ b/packages/builder/cypress.json
@@ -1,9 +1,9 @@
 {
-  "baseUrl": "http://localhost:10001/builder/",
+  "baseUrl": "http://localhost:10000/builder/",
   "video": true,
   "projectId": "bmbemn",
   "env": {
-    "PORT": "10001",
+    "PORT": "10000",
     "JWT_SECRET": "test"
   }
 }
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 82e3c45a1f..ce0a5a7507 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -49,7 +49,6 @@ Cypress.Commands.add("deleteApp", () => {
   cy.request(`localhost:${Cypress.env("PORT")}/api/applications?status=all`)
     .its("body")
     .then(val => {
-      console.log(val)
       if (val.length > 0) {
         cy.get(".title > :nth-child(3) > .spectrum-Icon").click()
         cy.contains("Delete").click()
@@ -186,8 +185,16 @@ Cypress.Commands.add("navigateToFrontend", () => {
 Cypress.Commands.add("createScreen", (screenName, route) => {
   cy.get("[aria-label=AddCircle]").click()
   cy.get(".spectrum-Modal").within(() => {
-    cy.get("input").first().type(screenName)
-    cy.get("input").eq(1).type(route)
+    cy.get(".item").first().click()
+    cy.get(".spectrum-Button--cta").click()
+  })
+  cy.get(".spectrum-Modal").within(() => {
+    cy.get("input").first().clear().type(screenName)
+    cy.get("input").eq(1).clear().type(route)
+    cy.get(".spectrum-Button--cta").click()
+  })
+  cy.get(".spectrum-Modal").within(() => {
+    cy.get(`[data-cy="left-nav"]`).click()
     cy.get(".spectrum-Button--cta").click()
   })
 })