diff --git a/js/apps/admin-ui/src/authentication/execution-model.ts b/js/apps/admin-ui/src/authentication/execution-model.ts
index 772cdb70e3..e678aade65 100644
--- a/js/apps/admin-ui/src/authentication/execution-model.ts
+++ b/js/apps/admin-ui/src/authentication/execution-model.ts
@@ -100,7 +100,9 @@ export class ExecutionList {
         currentIndex += ex.executionList.length;
       }
     }
-    return undefined;
+    return currentIndex === index
+      ? this.expandableList[this.expandableList.length - 1]
+      : undefined;
   }
 
   #getParentNodes(level: number, index: number) {