diff --git a/cypress/integration/workspace.js b/cypress/integration/workspace.js
index 0f8e24c82f..542cb3ddfc 100644
--- a/cypress/integration/workspace.js
+++ b/cypress/integration/workspace.js
@@ -18,7 +18,7 @@ context("Workspace 2.0", () => {
 		}).as("new_page");
 
 		cy.get(".codex-editor__redactor .ce-block");
-		cy.get('.workspace-footer button[data-label="New"]').click();
+		cy.get('.workspace-footer button[data-label="New"]:visible').click();
 		cy.fill_field("title", "Test Private Page", "Data");
 		cy.get_open_dialog().find(".modal-header").click();
 		cy.get_open_dialog().find(".btn-primary").click();
@@ -48,7 +48,7 @@ context("Workspace 2.0", () => {
 		}).as("new_page");
 
 		cy.get(".codex-editor__redactor .ce-block");
-		cy.get('.workspace-footer button[data-label="New"]').click();
+		cy.get('.workspace-footer button[data-label="New"]:visible').click();
 		cy.fill_field("title", "Test Child Page", "Data");
 		cy.fill_field("parent", "Test Private Page", "Select");
 		cy.get_open_dialog().find(".modal-header").click();
diff --git a/cypress/integration/workspace_blocks.js b/cypress/integration/workspace_blocks.js
index 480d57eaf8..9032ca1523 100644
--- a/cypress/integration/workspace_blocks.js
+++ b/cypress/integration/workspace_blocks.js
@@ -18,7 +18,7 @@ context("Workspace Blocks", () => {
 
 		cy.visit("/app/website");
 		cy.get(".codex-editor__redactor .ce-block");
-		cy.get('.workspace-footer button[data-label="New"]').click();
+		cy.get('.workspace-footer button[data-label="New"]:visible').click();
 		cy.fill_field("title", "Test Block Page", "Data");
 		cy.get_open_dialog().find(".modal-header").click();
 		cy.get_open_dialog().find(".btn-primary").click();
@@ -159,7 +159,7 @@ context("Workspace Blocks", () => {
 		]);
 
 		cy.get(".codex-editor__redactor .ce-block");
-		cy.get(".standard-actions .btn-secondary[data-label=Edit]").click();
+		cy.get(".workspace-footer .btn[data-label=Edit]").click();
 
 		cy.get(".ce-block").first().click({ force: true }).type("{enter}");
 		cy.get(".block-list-container .block-list-item").contains("Number Card").click();
diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js
index d5d95def6d..c09b2d65f2 100644
--- a/frappe/public/js/frappe/views/workspace/workspace.js
+++ b/frappe/public/js/frappe/views/workspace/workspace.js
@@ -388,7 +388,7 @@ frappe.views.Workspace = class Workspace {
 						</svg>
 						<span class="hidden-xs" data-label="Edit">New</span>
 					</button>
-					<button class="btn btn-secondary btn-default btn-sm mr-2 btn-edit-workspace" data-label="Edit">
+					<button class="btn btn-default btn-sm mr-2 btn-edit-workspace" data-label="Edit">
 						<svg class="es-icon es-line  icon-xs" style="" aria-hidden="true">
 							<use class="" href="#es-line-edit"></use>
 						</svg>