diff --git a/app/client/cypress/locators/Widgets.json b/app/client/cypress/locators/Widgets.json
index 9f2873427b..d54ea5211f 100644
--- a/app/client/cypress/locators/Widgets.json
+++ b/app/client/cypress/locators/Widgets.json
@@ -193,6 +193,7 @@
   "selectedTextSize": ".t--property-control-textsize .bp3-popover-target .sub-text",
   "colorPickerV2Popover": ".t--colorpicker-v2-popover",
   "colorPickerV2Color": ".t--colorpicker-v2-color",
+  "colorPickerV2PopoverContent": "[data-testid=\"color-picker\"]",
   "colorPickerV2TailwindColor": ".t--tailwind-colors .t--colorpicker-v2-color",
   "modalCloseButton": ".t--draggable-iconbuttonwidget .bp3-button",
   "filepickerwidgetv2": ".t--widget-filepickerwidgetv2",
diff --git a/app/client/cypress/support/WorkspaceCommands.js b/app/client/cypress/support/WorkspaceCommands.js
index 6dc65532a4..99804d54ba 100644
--- a/app/client/cypress/support/WorkspaceCommands.js
+++ b/app/client/cypress/support/WorkspaceCommands.js
@@ -160,7 +160,7 @@ Cypress.Commands.add("deleteUserFromWorkspace", (workspaceName) => {
 
   cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
     .closest(homePage.workspaceCompleteSection)
-    .find(homePage.workspaceNamePopover)
+    .scrollIntoView()
     .find(homePage.optionsIcon)
     .click({ force: true });
   cy.xpath(homePage.MemberSettings).click({ force: true });
@@ -191,7 +191,7 @@ Cypress.Commands.add(
 
     cy.get(homePage.workspaceList.concat(workspaceName).concat(")"))
       .closest(homePage.workspaceCompleteSection)
-      .find(homePage.workspaceNamePopover)
+      .scrollIntoView()
       .find(homePage.optionsIcon)
       .click({ force: true });
     cy.xpath(homePage.MemberSettings).click({ force: true });
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 47d1f6ab54..b300978d0c 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -200,7 +200,7 @@ Cypress.Commands.add("DeleteApp", (appName) => {
   cy.get('button span[icon="chevron-down"]').should("be.visible");
   cy.get(homePage.searchInput).clear().type(appName, { force: true });
   cy.get(homePage.applicationCard).trigger("mouseover");
-  cy.get(homePage.appMoreIcon)
+  cy.get("[data-testid=t--application-card-context-menu]")
     .should("have.length", 1)
     .first()
     .click({ force: true });
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index fca8c32e51..65072fe86e 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -580,6 +580,7 @@ export function ApplicationCard(props: ApplicationCardProps) {
         <MenuTrigger>
           <Button
             className="m-0.5"
+            data-testid="t--application-card-context-menu"
             isIconButton
             kind="tertiary"
             size="sm"