diff --git a/src/plugins/alwaysExpandRoles/index.ts b/src/plugins/alwaysExpandRoles/index.ts
index 1c20b9777..c674f90c5 100644
--- a/src/plugins/alwaysExpandRoles/index.ts
+++ b/src/plugins/alwaysExpandRoles/index.ts
@@ -28,10 +28,18 @@ export default definePlugin({
     patches: [
         {
             find: 'action:"EXPAND_ROLES"',
-            replacement: {
-                match: /(roles:\i(?=.+?(\i)\(!0\)[,;]\i\({action:"EXPAND_ROLES"}\)).+?\[\i,\2\]=\i\.useState\()!1\)/,
-                replace: (_, rest, setExpandedRoles) => `${rest}!0)`
-            }
+            replacement: [
+                {
+                    match: /(roles:\i(?=.+?(\i)\(!0\)[,;]\i\({action:"EXPAND_ROLES"}\)).+?\[\i,\2\]=\i\.useState\()!1\)/,
+                    replace: (_, rest, setExpandedRoles) => `${rest}!0)`
+                },
+                {
+                    // Fix not calculating non-expanded roles because the above patch makes the default "expanded",
+                    // which makes the collapse button never show up and calculation never occur
+                    match: /(?<=useLayoutEffect\(\(\)=>{if\()\i/,
+                    replace: isExpanded => "false"
+                }
+            ]
         }
     ]
 });