diff --git a/ui/src/components/LayoutShell.tsx b/ui/src/components/LayoutShell.tsx
index 01f36eb3..e0a2ed4f 100644
--- a/ui/src/components/LayoutShell.tsx
+++ b/ui/src/components/LayoutShell.tsx
@@ -502,28 +502,6 @@ function LayoutContent() {
         title="Cameleer"
       />
 
-      {/* Admin section — shown at top when on admin pages */}
-      {isAdminPage && (
-        <Sidebar.Section
-          icon={createElement(Settings, { size: 16 })}
-          label="Admin"
-          open={adminOpen}
-          onToggle={toggleAdmin}
-          active
-        >
-          <SidebarTree
-            nodes={adminTreeNodes}
-            selectedPath={location.pathname}
-            isStarred={isStarred}
-            onToggleStar={toggleStar}
-            filterQuery={filterQuery}
-            persistKey="admin"
-            autoRevealPath={sidebarRevealPath}
-            onNavigate={handleSidebarNavigate}
-          />
-        </Sidebar.Section>
-      )}
-
       {/* Applications section */}
       <Sidebar.Section
         icon={createElement(Box, { size: 16 })}
@@ -559,16 +537,28 @@ function LayoutContent() {
         </Sidebar.Section>
       )}
 
-      {/* Footer — Admin + API Docs */}
+      {/* Admin section — stays in place, expands when on admin pages */}
+      <Sidebar.Section
+        icon={createElement(Settings, { size: 16 })}
+        label="Admin"
+        open={adminOpen}
+        onToggle={toggleAdmin}
+        active={isAdminPage}
+      >
+        <SidebarTree
+          nodes={adminTreeNodes}
+          selectedPath={location.pathname}
+          isStarred={isStarred}
+          onToggleStar={toggleStar}
+          filterQuery={filterQuery}
+          persistKey="admin"
+          autoRevealPath={sidebarRevealPath}
+          onNavigate={handleSidebarNavigate}
+        />
+      </Sidebar.Section>
+
+      {/* Footer */}
       <Sidebar.Footer>
-        {!isAdminPage && (
-          <Sidebar.FooterLink
-            icon={createElement(Settings, { size: 16 })}
-            label="Admin"
-            active={false}
-            onClick={() => navigate('/admin/rbac')}
-          />
-        )}
         <Sidebar.FooterLink
           icon={createElement(FileText, { size: 16 })}
           label="API Docs"