diff --git a/cypress/integration/file_uploader.js b/cypress/integration/file_uploader.js
index cc3917e798..9905bc7461 100644
--- a/cypress/integration/file_uploader.js
+++ b/cypress/integration/file_uploader.js
@@ -5,6 +5,7 @@ context("FileUploader", () => {
 
 	beforeEach(() => {
 		cy.visit("/app");
+		cy.wait(2000); // workspace can load async and clear active dialog
 	});
 
 	function open_upload_dialog() {
@@ -13,7 +14,7 @@ context("FileUploader", () => {
 			.then((frappe) => {
 				new frappe.ui.FileUploader();
 			});
-		cy.wait(1000);
+		cy.wait(500);
 	}
 
 	it("upload dialog api works", () => {
diff --git a/frappe/core/doctype/navbar_settings/navbar_settings.js b/frappe/core/doctype/navbar_settings/navbar_settings.js
index ed7e331986..327576114e 100644
--- a/frappe/core/doctype/navbar_settings/navbar_settings.js
+++ b/frappe/core/doctype/navbar_settings/navbar_settings.js
@@ -1,4 +1,8 @@
 // Copyright (c) 2020, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Navbar Settings", {});
+frappe.ui.form.on("Navbar Settings", {
+	after_save: function (frm) {
+		frappe.ui.toolbar.clear_cache();
+	},
+});