diff --git a/plugins/catalog/src/components/EntityLayout/TabbedLayout.tsx b/plugins/catalog/src/components/EntityLayout/TabbedLayout.tsx
index ffe5709b48..a2209ba492 100644
--- a/plugins/catalog/src/components/EntityLayout/TabbedLayout.tsx
+++ b/plugins/catalog/src/components/EntityLayout/TabbedLayout.tsx
@@ -34,7 +34,7 @@ export function useSelectedSubRoute(
 
   const [matchedRoute] = matchRoutes(routes, `/${params['*']}`) ?? [];
   const foundIndex = matchedRoute
-    ? subRoutes.findIndex(t => t.path === matchedRoute.route.path)
+    ? subRoutes.findIndex(t => `${t.path}/*` === matchedRoute.route.path)
     : 0;
 
   return {