diff --git a/flux/src/helm-releases/Inventory.tsx b/flux/src/helm-releases/Inventory.tsx
index f4a8eebf2..ede47c693 100644
--- a/flux/src/helm-releases/Inventory.tsx
+++ b/flux/src/helm-releases/Inventory.tsx
@@ -271,10 +271,12 @@ function inventoryNameLink(item): JSX.Element {
   const pluralName = PluralName(kind);
 
   // Flux types
-  if (groupName.endsWith('toolkit.fluxcd.io')) {
+  const allowedDomain = 'toolkit.fluxcd.io';
+  const groupNameParts = groupName.split('.');
+  if (groupNameParts.length >= 3 && groupNameParts.slice(-2).join('.') === allowedDomain) {
     return (
       <Link
-        routeName={groupName.substring(0, groupName.indexOf('.'))}
+        routeName={groupNameParts[0]} // Extract the first segment as the route name
         params={{
           pluralName: pluralName,
           name: item.metadata.name,
diff --git a/flux/src/kustomizations/Inventory.tsx b/flux/src/kustomizations/Inventory.tsx
index 5eff5f834..31c3bc039 100644
--- a/flux/src/kustomizations/Inventory.tsx
+++ b/flux/src/kustomizations/Inventory.tsx
@@ -131,10 +131,12 @@ function inventoryNameLink(item: KubeObject) {
   const pluralName = PluralName(kind);
 
   // Flux types
-  if (groupName.endsWith('toolkit.fluxcd.io')) {
+  const allowedDomain = 'toolkit.fluxcd.io';
+  const groupNameParts = groupName.split('.');
+  if (groupNameParts.length >= 3 && groupNameParts.slice(-2).join('.') === allowedDomain) {
     return (
       <Link
-        routeName={groupName.substr(0, groupName.indexOf('.'))}
+        routeName={groupNameParts[0]} // Extract the first segment as the route name
         params={{
           pluralName: pluralName,
           name: item.metadata.name,