diff --git a/assets/src/components/kubernetes/cluster/Events.tsx b/assets/src/components/kubernetes/cluster/Events.tsx
index f84c7ac6e5..96fceab0f3 100644
--- a/assets/src/components/kubernetes/cluster/Events.tsx
+++ b/assets/src/components/kubernetes/cluster/Events.tsx
@@ -1,5 +1,7 @@
 import { createColumnHelper } from '@tanstack/react-table'
 
+import { Link } from 'react-router-dom'
+
 import {
   Common_EventList as EventListT,
   Common_Event as EventT,
@@ -42,12 +44,12 @@ const colObjectNamespace = columnHelper.accessor(
       }
 
       return (
-        <InlineLink
-          href={getResourceDetailsAbsPath(cluster?.id, 'namespace', namespace!)}
+        <Link
+          to={getResourceDetailsAbsPath(cluster?.id, 'namespace', namespace)}
           onClick={(e) => e.stopPropagation()}
         >
-          {getValue()}
-        </InlineLink>
+          <InlineLink>{getValue()}</InlineLink>
+        </Link>
       )
     },
   }
diff --git a/assets/src/components/kubernetes/storage/PersistentVolumeClaims.tsx b/assets/src/components/kubernetes/storage/PersistentVolumeClaims.tsx
index bcefa6ce57..e0acff3b3b 100644
--- a/assets/src/components/kubernetes/storage/PersistentVolumeClaims.tsx
+++ b/assets/src/components/kubernetes/storage/PersistentVolumeClaims.tsx
@@ -3,6 +3,8 @@ import { useMemo } from 'react'
 
 import { ChipList } from '@pluralsh/design-system'
 
+import { Link } from 'react-router-dom'
+
 import {
   Persistentvolumeclaim_PersistentVolumeClaimList as PersistentVolumeClaimListT,
   Persistentvolumeclaim_PersistentVolumeClaim as PersistentVolumeClaimT,
@@ -40,16 +42,16 @@ const colVolume = columnHelper.accessor((pvc) => pvc.volume, {
     }
 
     return (
-      <InlineLink
-        href={getResourceDetailsAbsPath(
+      <Link
+        to={getResourceDetailsAbsPath(
           cluster?.id,
           'persistentvolume',
-          getValue()!
+          getValue()
         )}
         onClick={(e) => e.stopPropagation()}
       >
-        {getValue()}
-      </InlineLink>
+        <InlineLink>{getValue()}</InlineLink>
+      </Link>
     )
   },
 })
@@ -63,16 +65,12 @@ const colStorageClass = columnHelper.accessor((pvc) => pvc.storageClass, {
     }
 
     return (
-      <InlineLink
-        href={getResourceDetailsAbsPath(
-          cluster?.id,
-          'storageclass',
-          getValue()!
-        )}
+      <Link
+        to={getResourceDetailsAbsPath(cluster?.id, 'storageclass', getValue())}
         onClick={(e) => e.stopPropagation()}
       >
-        {getValue()}
-      </InlineLink>
+        <InlineLink>{getValue()}</InlineLink>
+      </Link>
     )
   },
 })
diff --git a/assets/src/components/kubernetes/storage/PersistentVolumes.tsx b/assets/src/components/kubernetes/storage/PersistentVolumes.tsx
index 055e27c09e..a0c96b16f4 100644
--- a/assets/src/components/kubernetes/storage/PersistentVolumes.tsx
+++ b/assets/src/components/kubernetes/storage/PersistentVolumes.tsx
@@ -1,7 +1,7 @@
 import { createColumnHelper } from '@tanstack/react-table'
 import { useMemo } from 'react'
-
 import { ChipList } from '@pluralsh/design-system'
+import { Link } from 'react-router-dom'
 
 import {
   Persistentvolume_PersistentVolumeList as PersistentVolumeListT,
@@ -15,10 +15,7 @@ import { ResourceList } from '../ResourceList'
 
 import { ClusterTinyFragment } from '../../../generated/graphql'
 import { InlineLink } from '../../utils/typography/InlineLink'
-import {
-  STORAGE_CLASSES_REL_PATH,
-  getStorageResourceDetailsAbsPath,
-} from '../../../routes/kubernetesRoutesConsts'
+import { getResourceDetailsAbsPath } from '../../../routes/kubernetesRoutesConsts'
 
 import { PVStatusChip } from './utils'
 
@@ -40,17 +37,17 @@ const colClaim = columnHelper.accessor((pv) => pv.claim, {
     const [name, namespace] = (getValue() ?? '').split('/')
 
     return (
-      <InlineLink
-        href={getStorageResourceDetailsAbsPath(
-          STORAGE_CLASSES_REL_PATH,
+      <Link
+        to={getResourceDetailsAbsPath(
           cluster?.id,
+          'persistentvolumeclaim',
           name,
           namespace
         )}
         onClick={(e) => e.stopPropagation()}
       >
-        {getValue()}
-      </InlineLink>
+        <InlineLink>{getValue()}</InlineLink>
+      </Link>
     )
   },
 })
@@ -64,16 +61,12 @@ const colStorageClass = columnHelper.accessor((pv) => pv.storageClass, {
     }
 
     return (
-      <InlineLink
-        href={getStorageResourceDetailsAbsPath(
-          STORAGE_CLASSES_REL_PATH,
-          cluster?.id,
-          getValue()
-        )}
+      <Link
+        to={getResourceDetailsAbsPath(cluster?.id, 'storageclass', getValue())}
         onClick={(e) => e.stopPropagation()}
       >
-        {getValue()}
-      </InlineLink>
+        <InlineLink>{getValue()}</InlineLink>
+      </Link>
     )
   },
 })
diff --git a/assets/src/components/kubernetes/workloads/Pods.tsx b/assets/src/components/kubernetes/workloads/Pods.tsx
index 3e8fa657a3..f126c5825d 100644
--- a/assets/src/components/kubernetes/workloads/Pods.tsx
+++ b/assets/src/components/kubernetes/workloads/Pods.tsx
@@ -55,7 +55,7 @@ const colNode = columnHelper.accessor((pod) => pod?.nodeName, {
         to={getResourceDetailsAbsPath(cluster?.id, 'node', getValue())}
         onClick={(e) => e.stopPropagation()}
       >
-        {getValue()}
+        <InlineLink>{getValue()}</InlineLink>
       </Link>
     )
   },