diff --git a/Data/Server/WebUI/src/Assemblies/Assembly_List.jsx b/Data/Server/WebUI/src/Assemblies/Assembly_List.jsx
index bd91fa5..5f5fc1d 100644
--- a/Data/Server/WebUI/src/Assemblies/Assembly_List.jsx
+++ b/Data/Server/WebUI/src/Assemblies/Assembly_List.jsx
@@ -62,11 +62,14 @@ const Island = ({ title, description, icon, actions, children, sx }) => (
 // ---------------- Workflows Island -----------------
 const sortTree = (node) => {
   if (!node || !Array.isArray(node.children)) return;
-  node.children.sort((a, b) =>
-    String(a.label || "").localeCompare(String(b.label || ""), undefined, {
+  node.children.sort((a, b) => {
+    const aFolder = Boolean(a.isFolder);
+    const bFolder = Boolean(b.isFolder);
+    if (aFolder !== bFolder) return aFolder ? -1 : 1;
+    return String(a.label || "").localeCompare(String(b.label || ""), undefined, {
       sensitivity: "base"
-    })
-  );
+    });
+  });
   node.children.forEach(sortTree);
 };