diff --git a/.changeset/mighty-toys-remain.md b/.changeset/mighty-toys-remain.md
new file mode 100644
index 0000000000..afaee9464b
--- /dev/null
+++ b/.changeset/mighty-toys-remain.md
@@ -0,0 +1,5 @@
+---
+'@primer/view-components': patch
+---
+
+Fix overlapping issue in TabNav at narrow viewports.
diff --git a/app/components/primer/alpha/tab_nav.pcss b/app/components/primer/alpha/tab_nav.pcss
index 78a26ae169..c233fbeef8 100644
--- a/app/components/primer/alpha/tab_nav.pcss
+++ b/app/components/primer/alpha/tab_nav.pcss
@@ -12,7 +12,13 @@
   display: flex;
   /* stylelint-disable-next-line primer/spacing */
   margin-bottom: calc(var(--borderWidth-thin) * -1);
-  overflow: hidden;
+  overflow-x: auto;
+  overflow-y: hidden;
+
+  /* stylelint-disable-next-line selector-max-type */
+  & > li {
+    flex-shrink: 0;
+  }
 }
 
 .tabnav-tab {