diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 4f80218c14..c1fc21fe76 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -59,12 +59,10 @@ frappe.Application = class Application {
 			shortcut: 'shift+ctrl+g',
 			description: __('Switch Theme'),
 			action: () => {
-				if (cur_dialog) {
+				if (frappe.theme_switcher && frappe.theme_switcher.dialog.is_visible) {
 					frappe.theme_switcher.hide();
 				} else {
-					if (!frappe.theme_switcher) {
-						frappe.theme_switcher = new frappe.ui.ThemeSwitcher();
-					}
+					frappe.theme_switcher = new frappe.ui.ThemeSwitcher();
 					frappe.theme_switcher.show();
 				}
 			}