diff --git a/src/components/messageStream/FilterChips.tsx b/src/components/messageStream/FilterChips.tsx
index 819a816..67e4f44 100644
--- a/src/components/messageStream/FilterChips.tsx
+++ b/src/components/messageStream/FilterChips.tsx
@@ -1,3 +1,5 @@
+import { SlidersHorizontal } from "lucide-react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { useI18n } from "../../i18n";
 import { typeFilterLabel } from "../../resourceTypeLabels";
 
@@ -20,26 +22,95 @@ export type FilterChipsProps = {
 
 export function FilterChips({ type, onTypeChange }: FilterChipsProps) {
   const { t } = useI18n();
+  const containerRef = useRef<HTMLDivElement>(null);
+  const measureRef = useRef<HTMLDivElement>(null);
+  const [expanded, setExpanded] = useState(false);
+  const [hasOverflow, setHasOverflow] = useState(false);
+
+  const labelsKey = useMemo(
+    () => TYPE_FILTERS.map((tp) => typeFilterLabel(t, tp)).join("|"),
+    [t],
+  );
+
+  useEffect(() => {
+    const checkOverflow = () => {
+      const container = containerRef.current;
+      const measure = measureRef.current;
+      if (!container || !measure) return;
+
+      const nextHasOverflow = measure.scrollWidth > container.clientWidth + 1;
+      setHasOverflow(nextHasOverflow);
+      if (!nextHasOverflow) setExpanded(false);
+    };
+
+    checkOverflow();
+    const resizeObserver = new ResizeObserver(checkOverflow);
+    if (containerRef.current) resizeObserver.observe(containerRef.current);
+    if (measureRef.current) resizeObserver.observe(measureRef.current);
+    return () => resizeObserver.disconnect();
+  }, [labelsKey]);
+
+  const chipClass = (active: boolean) =>
+    `inline-flex h-8 min-w-[72px] shrink-0 items-center justify-center rounded-full border px-3 text-xs leading-none transition ${
+      active
+        ? "border-ark-gold bg-ark-gold/10 text-ark-gold2"
+        : "border-ark-line text-neutral-300 hover:border-ark-gold/50"
+    }`;
+
   return (
-    <div className="sticky top-0 z-10 border-b border-ark-line bg-ark-bg/90 py-2 backdrop-blur md:rounded-t-xl">
-      <div className="flex gap-1.5 overflow-x-auto whitespace-nowrap [-ms-overflow-style:none] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
-        {TYPE_FILTERS.map((tp) => {
-          const active = type === tp;
-          return (
-            <button
-              key={tp}
-              type="button"
-              onClick={() => onTypeChange(tp)}
-              className={`shrink-0 rounded-full border px-3 py-1 text-xs transition ${
-                active
-                  ? "border-ark-gold bg-ark-gold/10 text-ark-gold2"
-                  : "border-ark-line text-neutral-300 hover:border-ark-gold/50"
-              }`}
-            >
-              {typeFilterLabel(t, tp)}
-            </button>
-          );
-        })}
+    <div
+      ref={containerRef}
+      className="sticky top-0 z-10 border-b border-ark-line bg-ark-bg/90 py-2 backdrop-blur md:rounded-t-xl"
+    >
+      <div className="flex items-start gap-1.5">
+        <div
+          className={`flex min-w-0 flex-1 gap-1.5 ${
+            expanded
+              ? "flex-wrap whitespace-normal"
+              : "overflow-hidden whitespace-nowrap"
+          }`}
+        >
+          {TYPE_FILTERS.map((tp) => {
+            const active = type === tp;
+            return (
+              <button
+                key={tp}
+                type="button"
+                onClick={() => onTypeChange(tp)}
+                className={chipClass(active)}
+              >
+                {typeFilterLabel(t, tp)}
+              </button>
+            );
+          })}
+        </div>
+
+        {hasOverflow ? (
+          <button
+            type="button"
+            onClick={() => setExpanded((value) => !value)}
+            className="inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-full border border-ark-line bg-[#1a1b20] text-neutral-200 transition hover:border-ark-gold/60 hover:text-ark-gold2 min-[440px]:w-9 md:w-10"
+            aria-label={expanded ? "Collapse filters" : "Expand filters"}
+            aria-expanded={expanded}
+          >
+            <SlidersHorizontal
+              className="h-3.5 w-3.5 md:h-4 md:w-4"
+              strokeWidth={2.2}
+            />
+          </button>
+        ) : null}
+      </div>
+
+      <div
+        ref={measureRef}
+        aria-hidden="true"
+        className="pointer-events-none invisible absolute left-0 top-0 -z-10 flex gap-1.5 whitespace-nowrap"
+      >
+        {TYPE_FILTERS.map((tp) => (
+          <span key={tp} className={chipClass(type === tp)}>
+            {typeFilterLabel(t, tp)}
+          </span>
+        ))}
       </div>
     </div>
   );