diff --git a/cypress/integration/dashboard_links.js b/cypress/integration/dashboard_links.js
index 061899ec95..ebcdfa0048 100644
--- a/cypress/integration/dashboard_links.js
+++ b/cypress/integration/dashboard_links.js
@@ -17,7 +17,7 @@ context("Dashboard links", () => {
 			.window()
 			.its("frappe")
 			.then((frappe) => {
-				return frappe.xcall("frappe.tests.ui_test_helpers.update_child_table", {
+				frappe.call("frappe.tests.ui_test_helpers.update_child_table", {
 					name: child_table_doctype_name,
 				});
 			});
diff --git a/cypress/integration/workspace_blocks.js b/cypress/integration/workspace_blocks.js
index 47c5424bce..2db646f38e 100644
--- a/cypress/integration/workspace_blocks.js
+++ b/cypress/integration/workspace_blocks.js
@@ -71,7 +71,6 @@ context("Workspace Blocks", () => {
 			url: "api/method/frappe.desk.form.load.getdoctype?**",
 		}).as("get_doctype");
 
-		cy.visit("/app/tools");
 		cy.get(".codex-editor__redactor .ce-block");
 		cy.get(".standard-actions .btn-secondary[data-label=Edit]").click();
 
@@ -79,10 +78,8 @@ context("Workspace Blocks", () => {
 		cy.get(".ce-block").first().click({ force: true }).type("{enter}");
 		cy.get(".block-list-container .block-list-item").contains("Quick List").click();
 
-		cy.get_open_dialog().find(".modal-header").click();
-
+		cy.fill_field("label", "ToDo", "Data");
 		cy.fill_field("document_type", "ToDo", "Link").blur();
-		cy.fill_field("label", "ToDo", "Data").blur();
 		cy.wait("@get_doctype");
 
 		cy.get_open_dialog().find(".filter-edit-area").should("contain", "No filters selected");
@@ -122,6 +119,7 @@ context("Workspace Blocks", () => {
 
 		cy.get_open_dialog()
 			.find(".filter-field .input-with-feedback")
+			.focus()
 			.type("{selectall}Approved");
 		cy.get_open_dialog().find(".modal-header").click();
 		cy.get_open_dialog().find(".btn-primary").click();
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index a51e1daf17..20de7508c0 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -285,7 +285,7 @@ Cypress.Commands.add("get_open_dialog", () => {
 
 Cypress.Commands.add("save", () => {
 	cy.intercept("/api/method/frappe.desk.form.save.savedocs").as("save_call");
-	cy.get(`button[data-label="Save"]:visible`).click({ scrollBehavior: false, force: true });
+	cy.get(`button[data-label="Save"]:visible`).click({ scrollBehavior: "top", force: true });
 	cy.wait("@save_call");
 });
 Cypress.Commands.add("hide_dialog", () => {