diff --git a/src/renderer/components/metrics/MetricPill.test.tsx b/src/renderer/components/metrics/MetricPill.test.tsx
index 4528894e8..9715b5dc6 100644
--- a/src/renderer/components/metrics/MetricPill.test.tsx
+++ b/src/renderer/components/metrics/MetricPill.test.tsx
@@ -1,3 +1,6 @@
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
 import { MarkGithubIcon } from '@primer/octicons-react';
 
 import { renderWithProviders } from '../../__helpers__/test-utils';
@@ -31,4 +34,19 @@ describe('renderer/components/metrics/MetricPill.tsx', () => {
 
     expect(tree.container).toMatchSnapshot();
   });
+
+  it('has a single tab stop when the pill is not clickable', async () => {
+    renderWithProviders(
+      <>
+        <MetricPill color={IconColor.GREEN} contents="Mock Pill" icon={MarkGithubIcon} metric={1} />
+        <button type="button">Next</button>
+      </>,
+    );
+
+    await userEvent.tab();
+    expect(screen.getByRole('button', { name: /Mock Pill|1/ })).toHaveFocus();
+
+    await userEvent.tab();
+    expect(screen.getByRole('button', { name: 'Next' })).toHaveFocus();
+  });
 });
diff --git a/src/renderer/components/metrics/MetricPill.tsx b/src/renderer/components/metrics/MetricPill.tsx
index 06271bfb5..a161ebf97 100644
--- a/src/renderer/components/metrics/MetricPill.tsx
+++ b/src/renderer/components/metrics/MetricPill.tsx
@@ -25,12 +25,7 @@ export function MetricPill(props: Readonly<MetricPillProps>) {
     // @ts-expect-error: We overload text with a ReactNode
     <Tooltip direction="s" text={props.contents}>
       <button aria-label={props.ariaLabel} type="button" onClick={props.onClick}>
-        <Label
-          className="hover:bg-gitify-notification-pill-hover"
-          size="small"
-          tabIndex={props.onClick ? undefined : 0}
-          variant="secondary"
-        >
+        <Label className="hover:bg-gitify-notification-pill-hover" size="small" variant="secondary">
           <Stack align="center" direction="horizontal" gap="none">
             {Icon ? <Icon className={props.color} size={Size.XSMALL} /> : props.iconElement}
             {props.metric ? (
diff --git a/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
index 8d83804bc..32708d6ee 100644
--- a/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/CommentsPill.test.tsx.snap
@@ -11,7 +11,6 @@ exports[`renderer/components/metrics/CommentsPill.tsx > renders with 1 comment 1
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
@@ -74,7 +73,6 @@ exports[`renderer/components/metrics/CommentsPill.tsx > renders with multiple co
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
diff --git a/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
index b885d1461..192fbaeb9 100644
--- a/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/LabelsPill.test.tsx.snap
@@ -11,7 +11,6 @@ exports[`renderer/components/metrics/LabelsPill.tsx > renders with labels 1`] =
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
diff --git a/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
index 128fcdd9a..15bec19b0 100644
--- a/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/LinkedIssuesPill.test.tsx.snap
@@ -11,7 +11,6 @@ exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when linked
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
@@ -77,7 +76,6 @@ exports[`renderer/components/metrics/LinkedIssuesPill.tsx > renders when linked
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
diff --git a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
index a0b9ced4f..886180a22 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
@@ -16,7 +16,6 @@ exports[`renderer/components/metrics/MetricGroup.tsx > renders pills when showPi
         data-component="Label"
         data-size="small"
         data-variant="secondary"
-        tabindex="0"
       >
         <div
           class="prc-Stack-Stack-UQ9k6"
@@ -74,7 +73,6 @@ exports[`renderer/components/metrics/MetricGroup.tsx > renders pills when showPi
         data-component="Label"
         data-size="small"
         data-variant="secondary"
-        tabindex="0"
       >
         <div
           class="prc-Stack-Stack-UQ9k6"
diff --git a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
index 413dc7949..2fa0d8ea4 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
@@ -11,7 +11,6 @@ exports[`renderer/components/metrics/MetricPill.tsx > renders with metric 1`] =
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
@@ -74,7 +73,6 @@ exports[`renderer/components/metrics/MetricPill.tsx > renders without metric 1`]
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
diff --git a/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
index 3421203b9..50c5c2934 100644
--- a/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MilestonePill.test.tsx.snap
@@ -11,7 +11,6 @@ exports[`renderer/components/metrics/MilestonePill.tsx > renders closed mileston
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
@@ -68,7 +67,6 @@ exports[`renderer/components/metrics/MilestonePill.tsx > renders open milestone
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
diff --git a/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
index fd48ec2bc..7def95e1e 100644
--- a/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/ReactionsPill.test.tsx.snap
@@ -11,7 +11,6 @@ exports[`renderer/components/metrics/ReactionsPill.tsx > renders when multiple r
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
@@ -208,7 +207,6 @@ exports[`renderer/components/metrics/ReactionsPill.tsx > renders when one reacti
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
diff --git a/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
index 7b87bdd6d..ef04f1a65 100644
--- a/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/ReviewsPill.test.tsx.snap
@@ -13,7 +13,6 @@ exports[`renderer/components/metrics/ReviewsPill.tsx > renders review pills when
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
@@ -71,7 +70,6 @@ exports[`renderer/components/metrics/ReviewsPill.tsx > renders review pills when
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
@@ -129,7 +127,6 @@ exports[`renderer/components/metrics/ReviewsPill.tsx > renders review pills when
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
diff --git a/src/renderer/components/metrics/__snapshots__/SubIssueProgressPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/SubIssueProgressPill.test.tsx.snap
index 5e256608f..39bab68f3 100644
--- a/src/renderer/components/metrics/__snapshots__/SubIssueProgressPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/SubIssueProgressPill.test.tsx.snap
@@ -12,7 +12,6 @@ exports[`renderer/components/metrics/SubIssueProgressPill.tsx > renders complete
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"
@@ -90,7 +89,6 @@ exports[`renderer/components/metrics/SubIssueProgressPill.tsx > renders in-progr
       data-component="Label"
       data-size="small"
       data-variant="secondary"
-      tabindex="0"
     >
       <div
         class="prc-Stack-Stack-UQ9k6"