diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js
index beb799124c..af02629038 100644
--- a/frappe/public/js/frappe/views/workspace/workspace.js
+++ b/frappe/public/js/frappe/views/workspace/workspace.js
@@ -157,7 +157,10 @@ frappe.views.Workspace = class Workspace {
 			sidebar_section.addClass("hidden");
 		}
 
-		if (sidebar_section.find("> [item-is-hidden='0']").length == 0) {
+		if (
+			sidebar_section.find("sidebar-item-container").length &&
+			sidebar_section.find("> [item-is-hidden='0']").length == 0
+		) {
 			sidebar_section.addClass("hidden show-in-edit-mode");
 		}
 	}
@@ -1445,15 +1448,15 @@ frappe.views.Workspace = class Workspace {
 	}
 
 	create_sidebar_skeleton() {
-		if (this.sidebar.find(".workspace-sidebar-skeleton").length) return;
+		if ($(".workspace-sidebar-skeleton").length) return;
 
-		this.sidebar.prepend(frappe.render_template("workspace_sidebar_loading_skeleton"));
-		this.sidebar.find(".standard-sidebar-section").addClass("hidden");
+		$(frappe.render_template("workspace_sidebar_loading_skeleton")).insertBefore(this.sidebar);
+		this.sidebar.addClass("hidden");
 	}
 
 	remove_sidebar_skeleton() {
-		this.sidebar.find(".standard-sidebar-section").removeClass("hidden");
-		this.sidebar.find(".workspace-sidebar-skeleton").remove();
+		this.sidebar.removeClass("hidden");
+		$(".workspace-sidebar-skeleton").remove();
 	}
 
 	register_awesomebar_shortcut() {