diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index e7f753fdb0..bb26e53d80 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -639,7 +639,9 @@ Cypress.Commands.add(
     cy.get(".spectrum-Button").contains("Add screen").click({ force: true })
     cy.get(".spectrum-Dialog-grid").within(() => {
       cy.get("[data-cy='autogenerated-screens']").click()
+      cy.intercept("**/api/datasources").as("autoScreens")
       cy.get(".spectrum-Button").contains("Continue").click({ force: true })
+      cy.wait("@autoScreens")
     })
     cy.get("[data-cy='autogenerated-screens']").should("not.exist")
     cy.get("[data-cy='data-source-modal']", { timeout: 10000 }).within(() => {