diff --git a/scripts/cypress-v2/integration/common/4b_table_view_share.js b/scripts/cypress-v2/integration/common/4b_table_view_share.js
index 4e3338f61f..ff6e0df3b7 100644
--- a/scripts/cypress-v2/integration/common/4b_table_view_share.js
+++ b/scripts/cypress-v2/integration/common/4b_table_view_share.js
@@ -84,7 +84,9 @@ export const genTest = (apiType, dbType) => {
 
             // if pwd is incorrect, active modal requesting to feed in password again will persist
             // cy.getActiveModal().find('button:contains("Unlock")').should('not.exist');
-            cy.get(".ant-modal-content:visible").should("not.exist")
+            // cy.get(".ant-modal-content:visible").should("not.exist")
+
+            cy.wait(1000);
 
             // Verify Download as CSV is here
             mainPage.downloadCsv().should("exist");
diff --git a/scripts/cypress-v2/support/page_objects/mainPage.js b/scripts/cypress-v2/support/page_objects/mainPage.js
index 2ea4b64a98..ba2348498c 100644
--- a/scripts/cypress-v2/support/page_objects/mainPage.js
+++ b/scripts/cypress-v2/support/page_objects/mainPage.js
@@ -264,27 +264,27 @@ export class _mainPage {
     };
 
     shareViewList = () => {
-        cy.get(".nc-actions-menu-btn").click();
+        cy.get(".nc-actions-menu-btn").should('exist').click();
         return cy.getActiveMenu().find('.ant-dropdown-menu-item').contains('Shared View List');
     };
 
     downloadCsv = () => {
-        cy.get(".nc-actions-menu-btn").click();
+        cy.get(".nc-actions-menu-btn").should('exist').click();
         return cy.getActiveMenu().find('.ant-dropdown-menu-item').contains('Download as CSV');
     };
 
     downloadExcel = () => {
-        cy.get(".nc-actions-menu-btn").click();
+        cy.get(".nc-actions-menu-btn").should('exist').click();
         return cy.getActiveMenu().find('.ant-dropdown-menu-item').contains('Download as XLSX');
     };
 
     uploadCsv = () => {
-        cy.get(".nc-actions-menu-btn").click();
+        cy.get(".nc-actions-menu-btn").should('exist').click();
         return cy.getActiveMenu().find('.ant-dropdown-menu-item').contains('Upload CSV');
     };
 
     automations = () => {
-        cy.get(".nc-actions-menu-btn").click();
+        cy.get(".nc-actions-menu-btn").should('exist').click();
         return cy.getActiveMenu().find('.ant-dropdown-menu-item').contains('Webhooks');
     };