diff --git a/plugins/catalog/src/components/EntityPage/EntityPage.tsx b/plugins/catalog/src/components/EntityPage/EntityPage.tsx
index a36ac32a07..adbc758067 100644
--- a/plugins/catalog/src/components/EntityPage/EntityPage.tsx
+++ b/plugins/catalog/src/components/EntityPage/EntityPage.tsx
@@ -206,10 +206,12 @@ export const EntityPage: FC<{}> = () => {
             tabs={filteredHeaderTabs}
             onChange={idx => {
               navigate(
-                `/catalog/${kind}/${optionalNamespaceAndName}/${tabs[idx].id}`,
+                `/catalog/${kind}/${optionalNamespaceAndName}/${filteredHeaderTabs[idx].id}`,
               );
             }}
-            selectedIndex={tabs.findIndex(tab => tab.id === selectedTabId)}
+            selectedIndex={filteredHeaderTabs.findIndex(
+              tab => tab.id === selectedTabId,
+            )}
           />
 
           {selectedTab && selectedTab.content