diff --git a/web/static/css/style.css b/web/static/css/style.css
index ba28fa4a..21f0d7eb 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -42301,6 +42301,12 @@ html[data-theme="dark"] .workflow-toolbar #workflow-connect-btn[aria-pressed="tr
     max-height: none;
 }
 
+.rbac-panel-users > .rbac-panel-head,
+.rbac-panel-users > .rbac-search {
+    /* Keep the fixed controls intact when a long member list needs to shrink. */
+    flex: 0 0 auto;
+}
+
 .rbac-panel-users .rbac-list {
     flex: 1 1 auto;
     min-height: 0;
@@ -42814,19 +42820,23 @@ html[data-theme="dark"] .workflow-toolbar #workflow-connect-btn[aria-pressed="tr
 }
 
 .rbac-role-management {
+    display: flex;
+    flex-direction: column;
     min-height: 0;
+    overflow: hidden;
     padding: 18px;
     border-radius: 10px;
 }
 
 .rbac-role-management-head {
+    flex: 0 0 auto;
     align-items: flex-end;
     flex-wrap: wrap;
     row-gap: 12px;
 }
 
 .rbac-role-management-head > div:first-child {
-    flex: 1 1 320px;
+    flex: 1 1 auto;
     min-width: 0;
 }
 
@@ -42861,7 +42871,12 @@ html[data-theme="dark"] .workflow-toolbar #workflow-connect-btn[aria-pressed="tr
 }
 
 .rbac-role-catalog {
+    flex: 1 1 auto;
+    min-height: 0;
+    overflow-y: auto;
+    overscroll-behavior: contain;
     grid-template-columns: repeat(auto-fit, minmax(min(100%, 360px), 1fr));
+    align-content: start;
     align-items: stretch;
 }
 
diff --git a/web/templates/index.html b/web/templates/index.html
index 109d8ace..7229f601 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
@@ -39,7 +39,7 @@
             }
         })();
     </script>
-    <link rel="stylesheet" href="/static/css/style.css?v=20261027-settings-sidebar-scroll">
+    <link rel="stylesheet" href="/static/css/style.css?v=20261027-rbac-role-catalog-scroll">
     <link rel="stylesheet" href="/static/css/tool-guard.css?v=20260907-7">
     <link rel="stylesheet" href="/static/css/chat-plan-progress.css?v=20260813-4">
     <link rel="stylesheet" href="/static/css/c2.css">