diff --git a/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/CreateOrgTests_spec.js b/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/CreateOrgTests_spec.js
index 62a13a40a9..62bba8efd1 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/CreateOrgTests_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/CreateOrgTests_spec.js
@@ -30,7 +30,9 @@ describe("Create new org and share with a user", function() {
     cy.get(homePage.searchInput).type(appid);
     cy.wait(2000);
     cy.get(homePage.appsContainer).contains(orgid);
-    cy.xpath(homePage.ShareBtn).should("not.exist");
+    cy.xpath(homePage.ShareBtn)
+      .first()
+      .should("be.visible");
     cy.get(homePage.applicationCard)
       .first()
       .trigger("mouseover");
diff --git a/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/ShareAppTests_spec.js b/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/ShareAppTests_spec.js
index 950b2c2454..a0bb635e1a 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/ShareAppTests_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/ShareAppTests_spec.js
@@ -33,7 +33,9 @@ describe("Create new org and share with a user", function() {
     cy.get(homePage.searchInput).type(appid);
     cy.wait(2000);
     cy.get(homePage.appsContainer).contains(orgid);
-    cy.xpath(homePage.ShareBtn).should("not.exist");
+    cy.xpath(homePage.ShareBtn)
+      .first()
+      .should("be.visible");
     cy.get(homePage.applicationCard).trigger("mouseover");
     cy.get(homePage.appEditIcon).should("not.exist");
     cy.launchApp(appid);