diff --git a/packages/builder/cypress/integration/createTable.spec.js b/packages/builder/cypress/integration/createTable.spec.js
index a30ecb5ad8..d7ae805b27 100644
--- a/packages/builder/cypress/integration/createTable.spec.js
+++ b/packages/builder/cypress/integration/createTable.spec.js
@@ -8,7 +8,7 @@ context("Create a Table", () => {
     cy.createTable("dog")
 
     // Check if Table exists
-    cy.get(".title").should("have.text", "dog")
+    cy.get(".title span").should("have.text", "dog")
   })
 
   it("adds a new column to the table", () => {
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 302a39a367..05b30da98f 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -68,6 +68,7 @@ Cypress.Commands.add("createTable", tableName => {
   cy.contains("Create New Table").click()
   cy.get(".menu-container")
     .get("input")
+    .first()
     .type(tableName)
 
   cy.contains("Save").click()