diff --git a/.changeset/page-header-tab-overflow.md b/.changeset/page-header-tab-overflow.md
new file mode 100644
index 0000000000..cf85443a91
--- /dev/null
+++ b/.changeset/page-header-tab-overflow.md
@@ -0,0 +1,5 @@
+---
+"@cloudflare/kumo": patch
+---
+
+Fix tab overflow in page header block and add overflow scroll handling to tabs component.
diff --git a/packages/kumo-docs-astro/src/components/kumo/page-header/page-header.tsx b/packages/kumo-docs-astro/src/components/kumo/page-header/page-header.tsx
index 560f3ae1e5..c78e659154 100644
--- a/packages/kumo-docs-astro/src/components/kumo/page-header/page-header.tsx
+++ b/packages/kumo-docs-astro/src/components/kumo/page-header/page-header.tsx
@@ -82,7 +82,7 @@ export function PageHeader({
       )}
 
       {tabs && (
-        <div className="flex w-full items-center justify-between border-b border-kumo-line pt-1 pb-3 pl-3">
+        <div className="flex w-full items-center justify-between gap-3 border-b border-kumo-line pt-1 pb-3 overflow-hidden">
           <Tabs
             tabs={tabs}
             selectedValue={defaultTab}
@@ -92,7 +92,7 @@ export function PageHeader({
             }}
           />
 
-          <div className="flex items-center gap-2">{children}</div>
+          <div className="ml-auto flex shrink-0 items-center gap-2">{children}</div>
         </div>
       )}
     </div>
diff --git a/packages/kumo/src/blocks/page-header/page-header.tsx b/packages/kumo/src/blocks/page-header/page-header.tsx
index c8e4c36194..0ca261c2e9 100644
--- a/packages/kumo/src/blocks/page-header/page-header.tsx
+++ b/packages/kumo/src/blocks/page-header/page-header.tsx
@@ -81,7 +81,7 @@ export function PageHeader({
       )}
 
       {tabs && (
-        <div className="flex w-full items-center justify-between border-b border-kumo-line pt-1 pb-3 pl-3">
+        <div className="flex w-full items-center justify-between gap-3 border-b border-kumo-line pt-1 pb-3 overflow-hidden">
           <Tabs
             tabs={tabs}
             selectedValue={defaultTab}
@@ -91,7 +91,7 @@ export function PageHeader({
             }}
           />
 
-          <div className="flex items-center gap-2">{children}</div>
+          <div className="ml-auto flex shrink-0 items-center gap-2">{children}</div>
         </div>
       )}
     </div>
diff --git a/packages/kumo/src/components/tabs/tabs.tsx b/packages/kumo/src/components/tabs/tabs.tsx
index 0630f41f6c..53fb485a75 100644
--- a/packages/kumo/src/components/tabs/tabs.tsx
+++ b/packages/kumo/src/components/tabs/tabs.tsx
@@ -156,7 +156,7 @@ export function Tabs({
       <TabsPrimitive.List
         activateOnFocus={activateOnFocus}
         className={cn(
-          "scrollbar-hide relative flex min-w-0 shrink items-stretch",
+          "no-scrollbar relative flex min-w-0 shrink items-stretch overflow-x-auto overflow-y-hidden",
           isSegmented && "h-9 rounded-lg bg-kumo-recessed px-0.5 ring ring-kumo-line/70",
           isUnderline && "h-7 gap-4 border-b border-kumo-ring pb-2",
           listClassName,