diff --git a/src/ActionList/Visuals.tsx b/src/ActionList/Visuals.tsx
index 4a290b20f3e..43570d0cd04 100644
--- a/src/ActionList/Visuals.tsx
+++ b/src/ActionList/Visuals.tsx
@@ -9,6 +9,7 @@ type VisualProps = SxProp & React.HTMLAttributes<HTMLSpanElement>
 export const LeadingVisualContainer: React.FC<React.PropsWithChildren<VisualProps>> = ({sx = {}, ...props}) => {
   return (
     <Box
+      data-component="ActionList.LeadingVisual"
       as="span"
       sx={merge(
         {
diff --git a/src/UnderlineNav2/UnderlineNav.tsx b/src/UnderlineNav2/UnderlineNav.tsx
index 44bdf4c29d1..e32dc57cedb 100644
--- a/src/UnderlineNav2/UnderlineNav.tsx
+++ b/src/UnderlineNav2/UnderlineNav.tsx
@@ -145,7 +145,6 @@ export const UnderlineNav = forwardRef(
       variant = 'default',
       loadingCounters = false,
       children,
-      ...props
     }: UnderlineNavProps,
     forwardedRef,
   ) => {
@@ -370,7 +369,6 @@ export const UnderlineNav = forwardRef(
                   ref={containerRef}
                   id={disclosureWidgetId}
                   sx={merge({display: isWidgetOpen ? 'block' : 'none'}, menuStyles)}
-                  {...props}
                 >
                   {actions.map((action, index) => {
                     const {children: actionElementChildren, ...actionElementProps} = action.props
diff --git a/src/UnderlineNav2/UnderlineNav2.features.stories.tsx b/src/UnderlineNav2/UnderlineNav2.features.stories.tsx
index d38796e3cdc..7c52532542a 100644
--- a/src/UnderlineNav2/UnderlineNav2.features.stories.tsx
+++ b/src/UnderlineNav2/UnderlineNav2.features.stories.tsx
@@ -76,11 +76,7 @@ const items: {navigation: string; icon: React.FC<IconProps>; counter?: number |
 export const OverflowTemplate = ({initialSelectedIndex = 1}: {initialSelectedIndex?: number}) => {
   const [selectedIndex, setSelectedIndex] = React.useState<number | null>(initialSelectedIndex)
   return (
-    <UnderlineNav
-      aria-label="Repository"
-      // @ts-ignore UnderlineNav does not take selectionVariant prop, but we need to pass it to the underlying ActionList so it doesn't show Selections.
-      selectionVariant={undefined}
-    >
+    <UnderlineNav aria-label="Repository">
       {items.map((item, index) => (
         <UnderlineNav.Item
           key={item.navigation}
diff --git a/src/UnderlineNav2/styles.ts b/src/UnderlineNav2/styles.ts
index 8ce978d02d6..ecfd29baab0 100644
--- a/src/UnderlineNav2/styles.ts
+++ b/src/UnderlineNav2/styles.ts
@@ -138,7 +138,7 @@ export const getLinkStyles = (
 
 export const menuItemStyles = {
   // This is needed to hide the selected check icon on the menu item. https://github.com/primer/react/blob/main/src/ActionList/Selection.tsx#L32
-  '& > span': {
+  '& span[data-component="ActionList.LeadingVisual"]': {
     display: 'none',
   },
   // To reset the style when the menu items are rendered as react router links