diff --git a/scripts/cypress/integration/common/5a_user_role.js b/scripts/cypress/integration/common/5a_user_role.js
index 8ccba12e06..e52eadaf66 100644
--- a/scripts/cypress/integration/common/5a_user_role.js
+++ b/scripts/cypress/integration/common/5a_user_role.js
@@ -147,8 +147,11 @@ export const genTest = (apiType, dbType) => {
         if (roleType === "creator") {
           // kludge: wait for page load to finish
           // close team & auth tab
-          cy.wait(500);
-          cy.get("button.ant-tabs-tab-remove").should("exist").click();
+          // cy.wait(500);
+          // cy.get("button.ant-tabs-tab-remove").should("exist").click();
+          cy.getSettled("button.ant-tabs-tab-remove")
+            .should("be.visible")
+            .click();
           cy.wait(500);
         }
 
diff --git a/scripts/cypress/support/page_objects/mainPage.js b/scripts/cypress/support/page_objects/mainPage.js
index 6c51ae162a..1b368e30ee 100644
--- a/scripts/cypress/support/page_objects/mainPage.js
+++ b/scripts/cypress/support/page_objects/mainPage.js
@@ -206,6 +206,8 @@ export class _mainPage {
   addColumn = (colName, tableName) => {
     cy.get(".nc-column-add").click();
 
+    cy.wait(2000);
+
     cy.getActiveMenu(".nc-dropdown-grid-add-column:has(.nc-column-name-input)")
       .find("input.nc-column-name-input")
       .should("exist")
@@ -217,12 +219,17 @@ export class _mainPage {
       .should("exist")
       .click();
     cy.toastWait(`Column created`);
+
+    cy.wait(2000);
+
     cy.get(`th[data-title="${colName}"]`).should("exist");
   };
 
   addColumnWithType = (colName, colType, tableName) => {
     cy.get(".nc-column-add").click();
 
+    cy.wait(2000);
+
     cy.getActiveMenu(".nc-dropdown-grid-add-column:has(.nc-column-name-input)")
       .find("input.nc-column-name-input")
       .should("exist")
@@ -244,6 +251,9 @@ export class _mainPage {
       .click();
 
     cy.toastWait(`Column created`);
+
+    cy.wait(2000);
+
     cy.get(`th[data-title="${colName}"]`).should("exist");
   };