diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json
index 79f8d9aaea..d6f9c13cbe 100644
--- a/frappe/core/doctype/user/user.json
+++ b/frappe/core/doctype/user/user.json
@@ -637,7 +637,7 @@
    "fieldname": "desk_theme",
    "fieldtype": "Select",
    "label": "Desk Theme",
-   "options": "Automatic\nLight\nDark"
+   "options": "Light\nDark\nAutomatic"
   },
   {
    "fieldname": "module_profile",
@@ -910,7 +910,7 @@
   }
  ],
  "make_attachments_public": 1,
- "modified": "2026-01-06 17:17:44.906709",
+ "modified": "2026-01-12 16:04:21.542524",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "User",
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 2cf28a8de3..5665ec1c84 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -85,7 +85,7 @@ class User(Document):
 		default_app: DF.Literal[None]
 		default_workspace: DF.Link | None
 		defaults: DF.Table[DefaultValue]
-		desk_theme: DF.Literal["Automatic", "Light", "Dark"]
+		desk_theme: DF.Literal["Light", "Dark", "Automatic"]
 		document_follow_frequency: DF.Literal["Hourly", "Daily", "Weekly"]
 		document_follow_notify: DF.Check
 		email: DF.Data
diff --git a/frappe/desk/page/desktop/desktop.js b/frappe/desk/page/desktop/desktop.js
index 5ae9158297..911bf03d11 100644
--- a/frappe/desk/page/desktop/desktop.js
+++ b/frappe/desk/page/desktop/desktop.js
@@ -231,7 +231,6 @@ class DesktopPage {
 		this.$desktop_edit_button.on("click", () => {
 			frappe.new_desktop_icons = JSON.parse(JSON.stringify(frappe.desktop_icons));
 			me.start_editing_layout();
-			me.$desktop_edit_button.hide();
 		});
 	}
 	setup_editing_mode() {
@@ -398,7 +397,6 @@ class DesktopPage {
 			if (frappe.get_route()[0] == "desktop" || frappe.get_route()[0] == "")
 				me.setup_navbar();
 			else {
-				me.$desktop_edit_button.remove();
 				$(".navbar").show();
 				frappe.desktop_utils.close_desktop_modal();
 				// stop edit mode if route changes and cleanup