diff --git a/frappe/boot.py b/frappe/boot.py
index df7288370b..72888fb1a4 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -628,6 +628,9 @@ def add_user_specific_sidebar(sidebar_items):
 		if f"-{frappe.session.user.lower()}" in sidebar:
 			sidebars_to_remove.append(sidebar)
 	for sidebar in sidebars_to_remove:
-		sidebar_name = sidebar.replace(f"-{frappe.session.user.lower()}", "")
-		sidebar_items[sidebar]["label"] = sidebar_items[sidebar_name]["label"]
-		sidebar_items[sidebar_name] = sidebar_items.pop(sidebar)
+		try:
+			sidebar_name = sidebar.replace(f"-{frappe.session.user.lower()}", "")
+			sidebar_items[sidebar]["label"] = sidebar_items[sidebar_name]["label"]
+			sidebar_items[sidebar_name] = sidebar_items.pop(sidebar)
+		except KeyError:
+			pass
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 0a823aa32a..93cb29f3f9 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -252,4 +252,4 @@ frappe.patches.v16_0.auto_generate_desktop_icon_and_sidebar
 frappe.patches.v16_0.add_private_workspaces_to_sidebar
 frappe.core.doctype.communication_link.patches.copy_communication_date_to_link
 frappe.core.doctype.communication.patches.drop_ref_dt_dn_index
-frappe.patches.v16_0.migrate_desktop_icon
+frappe.patches.v16_0.change_link_type_to_workspace_sidebar
diff --git a/frappe/patches/v16_0/migrate_desktop_icon.py b/frappe/patches/v16_0/change_link_type_to_workspace_sidebar.py
similarity index 94%
rename from frappe/patches/v16_0/migrate_desktop_icon.py
rename to frappe/patches/v16_0/change_link_type_to_workspace_sidebar.py
index 49ffc9c192..ed7167409b 100644
--- a/frappe/patches/v16_0/migrate_desktop_icon.py
+++ b/frappe/patches/v16_0/change_link_type_to_workspace_sidebar.py
@@ -9,4 +9,5 @@ def execute():
 			icon_doc.link_type = "Workspace Sidebar"
 			icon_doc.link_to = icon.name
 			icon_doc.save()
-			frappe.db.commit()
+
+	frappe.db.commit()