diff --git a/.changeset/selfish-seas-push.md b/.changeset/selfish-seas-push.md
new file mode 100644
index 0000000000..f3db605843
--- /dev/null
+++ b/.changeset/selfish-seas-push.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Remove usage of raw span
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.tsx
index 05a818fa1f..d6c1e6e59a 100644
--- a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.tsx
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.tsx
@@ -125,11 +125,15 @@ export const EntityPeekAheadPopover = (props: EntityPeekAheadPopoverProps) => {
 
   return (
     <>
-      <span onMouseEnter={debouncedHandleMouseEnter}>
-        <span data-testid="trigger" {...bindHover(popupState)}>
+      <Typography component="span" onMouseEnter={debouncedHandleMouseEnter}>
+        <Typography
+          component="span"
+          data-testid="trigger"
+          {...bindHover(popupState)}
+        >
           {children}
-        </span>
-      </span>
+        </Typography>
+      </Typography>
       {isHovered && (
         <HoverPopover
           PaperProps={{