diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js
index d0f1a21dd87..704e98ee7a9 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js
@@ -56,7 +56,14 @@ describe(
       cy.log("Creation of FirstAPI Action successful");
       cy.enterDatasourceAndPath(testdata.baseUrl, testdata.methods);
       cy.get(apiwidget.settings).click({ force: true });
-      cy.get(apiwidget.confirmBeforeExecute).click({ force: true });
+      cy.get("body").then((body) => {
+        if (body.find(apiwidget.confirmBeforeExecute).length > 0) {
+          cy.get(apiwidget.confirmBeforeExecute).click({ force: true });
+        } else {
+          cy.get(apiwidget.settings).click({ force: true });
+          cy.get(apiwidget.confirmBeforeExecute).click({ force: true });
+        }
+      });
       cy.get(apiwidget.runQueryButton).click();
       cy.get(".ads-v2-modal__content").find("button").contains("No").click();
       cy.get(apiwidget.runQueryButton).children().should("have.length", 1);
diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt
index aa00835ffb0..cbf08b7ab32 100644
--- a/app/client/cypress/limited-tests.txt
+++ b/app/client/cypress/limited-tests.txt
@@ -1,5 +1,5 @@
 # To run only limited tests - give the spec names in below format:
-cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js
+cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js
 # For running all specs - uncomment below:
 #cypress/e2e/**/**/*