diff --git a/tickets/006-collapse-via-title-bar-click.md b/tickets/006-collapse-via-title-bar-click.md
deleted file mode 100644
index d155273..0000000
--- a/tickets/006-collapse-via-title-bar-click.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Collapse sections by clicking title bar instead of a dedicated button
-
-Instead of having collapse buttons on the main view components/categories, clicking the title bars should collapse them.
-
-## Acceptance criteria
-- Clicking a section's title bar toggles its collapsed/expanded state.
-- Dedicated collapse buttons are removed (or repurposed as a visual indicator only, e.g. a chevron, without being the sole click target).
-- Title bar remains usable for any other existing interactions (if any) without conflicting with the collapse click.
diff --git a/webapp/src/components/Alerts.tsx b/webapp/src/components/Alerts.tsx
index 4dd4fcd..260bc45 100644
--- a/webapp/src/components/Alerts.tsx
+++ b/webapp/src/components/Alerts.tsx
@@ -9,7 +9,13 @@ import {
   type AlertRule,
   type CompareOp,
 } from '../lib/api'
-import { CollapseToggle, sectionHeaderClassName, sectionHeaderLeftClassName, useSectionCollapsed } from './CollapsibleSection'
+import {
+  CollapseToggle,
+  handleSectionHeaderKeyDown,
+  sectionHeaderInteractiveClassName,
+  sectionHeaderLeftClassName,
+  useSectionCollapsed,
+} from './CollapsibleSection'
 import { HelpIcon } from './HelpIcon'
 import { queryInputClassName } from './FilterBar'
 
@@ -231,13 +237,20 @@ export function Alerts() {
 
   return (
     <div className="border-b border-border text-sm">
-      <div className={sectionHeaderClassName}>
+      <div
+        className={sectionHeaderInteractiveClassName}
+        role="button"
+        tabIndex={0}
+        aria-expanded={!collapsed}
+        onClick={() => setCollapsed(!collapsed)}
+        onKeyDown={handleSectionHeaderKeyDown(() => setCollapsed(!collapsed))}
+      >
         <div className={sectionHeaderLeftClassName}>
           Alerts
           <HelpIcon sectionId="alerts" label="Help: Alerts" />
         </div>
         <div className="flex items-center gap-1.5">
-          <CollapseToggle collapsed={collapsed} onToggle={() => setCollapsed(!collapsed)} />
+          <CollapseToggle collapsed={collapsed} />
         </div>
       </div>
       <div hidden={collapsed}>
diff --git a/webapp/src/components/CollapsibleSection.tsx b/webapp/src/components/CollapsibleSection.tsx
index d3c3cfa..0c9fabc 100644
--- a/webapp/src/components/CollapsibleSection.tsx
+++ b/webapp/src/components/CollapsibleSection.tsx
@@ -3,9 +3,15 @@ import type { TimeRange } from './LogTimeline'
 
 /// Shared look for a primary section's title bar: shaded so it reads as a
 /// distinct band rather than blending into the section body below it.
+/// The bar itself is the collapse/expand click target (see `sectionHeaderInteractiveClassName`) —
+/// this className alone (no click handling) is for the rare header that stays static.
 export const sectionHeaderClassName =
   'flex items-center justify-between gap-2 border-b border-border-soft bg-surface-1 px-3 py-1.5'
 
+/// `sectionHeaderClassName` plus the affordance for a header row that toggles collapse on click:
+/// pointer cursor and a hover tint so the whole bar reads as clickable, not just the chevron.
+export const sectionHeaderInteractiveClassName = `${sectionHeaderClassName} cursor-pointer select-none hover:bg-surface-2`
+
 /// Left-hand cluster of a section header: title text, help icon, collapse/pop-out controls.
 export const sectionHeaderLeftClassName = 'flex items-center gap-1.5 text-sm font-medium text-text-secondary'
 
@@ -46,7 +52,24 @@ export function useSectionCollapsed(sectionId: string): [boolean, (next: boolean
   return [collapsed, setCollapsed]
 }
 
-export function CollapseToggle({ collapsed, onToggle }: { collapsed: boolean; onToggle: () => void }) {
+/// Chevron indicator for a section's collapsed/expanded state. For the title-bar sections
+/// (Alerts/Metrics/Params/Dashboards), the whole header row is the click target (see
+/// `sectionHeaderInteractiveClassName`) and `onToggle` is omitted — this renders as a
+/// non-interactive, decorative `span` rather than a nested `<button>`, with `aria-expanded`
+/// living on the header row itself. `onToggle` stays available for the log viewer's toggle
+/// (`App.tsx`), which sits in a filter toolbar rather than a plain title bar — there the
+/// chevron itself remains a dedicated button.
+export function CollapseToggle({ collapsed, onToggle }: { collapsed: boolean; onToggle?: () => void }) {
+  if (!onToggle) {
+    return (
+      <span
+        aria-hidden="true"
+        className="flex h-5 w-5 shrink-0 items-center justify-center rounded-full border border-border-soft bg-surface-2 text-xs leading-none text-text-muted"
+      >
+        {collapsed ? '▸' : '▾'}
+      </span>
+    )
+  }
   return (
     <button
       type="button"
@@ -61,6 +84,17 @@ export function CollapseToggle({ collapsed, onToggle }: { collapsed: boolean; on
   )
 }
 
+/// Keyboard handler for a header row using `sectionHeaderInteractiveClassName`: Enter/Space
+/// activate it like a button, matching the `role="button"` semantics on the row.
+export function handleSectionHeaderKeyDown(onToggle: () => void) {
+  return (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter' || e.key === ' ') {
+      e.preventDefault()
+      onToggle()
+    }
+  }
+}
+
 /// The four primary sections poppable into their own tab; matches the `?section=` query param a standalone page reads.
 export type PopOutSectionId = 'log' | 'params' | 'metrics' | 'dashboards'
 
@@ -78,7 +112,10 @@ export function PopOutButton({ section, range }: { section: PopOutSectionId; ran
   return (
     <button
       type="button"
-      onClick={() => window.open(popOutUrl(section, range), '_blank')}
+      onClick={(e) => {
+        e.stopPropagation()
+        window.open(popOutUrl(section, range), '_blank')
+      }}
       title="Open in new tab"
       aria-label="Open in new tab"
       className="flex h-5 w-5 shrink-0 items-center justify-center rounded-full border border-border-soft bg-surface-2 text-xs leading-none text-text-muted hover:border-border-strong hover:text-text-secondary"
diff --git a/webapp/src/components/Dashboards.tsx b/webapp/src/components/Dashboards.tsx
index 5b7e5ae..b0efcf7 100644
--- a/webapp/src/components/Dashboards.tsx
+++ b/webapp/src/components/Dashboards.tsx
@@ -16,8 +16,9 @@ import {
 } from '../lib/api'
 import {
   CollapseToggle,
+  handleSectionHeaderKeyDown,
   PopOutButton,
-  sectionHeaderClassName,
+  sectionHeaderInteractiveClassName,
   sectionHeaderLeftClassName,
   useSectionCollapsed,
 } from './CollapsibleSection'
@@ -217,13 +218,20 @@ export function Dashboards({ range }: { range: TimeRange | null }) {
   if (!activeProfile) {
     return (
       <div className="border-b border-border text-sm">
-        <div className={sectionHeaderClassName}>
+        <div
+          className={sectionHeaderInteractiveClassName}
+          role="button"
+          tabIndex={0}
+          aria-expanded={!collapsed}
+          onClick={() => setCollapsed(!collapsed)}
+          onKeyDown={handleSectionHeaderKeyDown(() => setCollapsed(!collapsed))}
+        >
           <div className={sectionHeaderLeftClassName}>
             Dashboards
             <HelpIcon sectionId="dashboards" label="Help: Dashboards" />
           </div>
           <div className="flex items-center gap-1.5">
-            <CollapseToggle collapsed={collapsed} onToggle={() => setCollapsed(!collapsed)} />
+            <CollapseToggle collapsed={collapsed} />
             <PopOutButton section="dashboards" range={range} />
           </div>
         </div>
@@ -236,13 +244,20 @@ export function Dashboards({ range }: { range: TimeRange | null }) {
 
   return (
     <div className="border-b border-border text-sm">
-      <div className={sectionHeaderClassName}>
+      <div
+        className={sectionHeaderInteractiveClassName}
+        role="button"
+        tabIndex={0}
+        aria-expanded={!collapsed}
+        onClick={() => setCollapsed(!collapsed)}
+        onKeyDown={handleSectionHeaderKeyDown(() => setCollapsed(!collapsed))}
+      >
         <div className={sectionHeaderLeftClassName}>
           Dashboards — profile "{activeProfile}"
           <HelpIcon sectionId="dashboards" label="Help: Dashboards" />
         </div>
         <div className="flex items-center gap-1.5">
-          <CollapseToggle collapsed={collapsed} onToggle={() => setCollapsed(!collapsed)} />
+          <CollapseToggle collapsed={collapsed} />
           <PopOutButton section="dashboards" range={range} />
         </div>
       </div>
diff --git a/webapp/src/components/HelpIcon.tsx b/webapp/src/components/HelpIcon.tsx
index 372582d..9b7ce70 100644
--- a/webapp/src/components/HelpIcon.tsx
+++ b/webapp/src/components/HelpIcon.tsx
@@ -6,7 +6,10 @@ export function HelpIcon({ sectionId, label }: { sectionId: string; label?: stri
   return (
     <button
       type="button"
-      onClick={() => openSection(sectionId)}
+      onClick={(e) => {
+        e.stopPropagation()
+        openSection(sectionId)
+      }}
       title="Open docs"
       aria-label={label ?? 'Open docs for this section'}
       className="flex h-5 w-5 shrink-0 items-center justify-center rounded-full border border-border-soft bg-surface-2 text-xs leading-none text-text-muted hover:border-border-strong hover:text-text-secondary"
diff --git a/webapp/src/components/Metrics.tsx b/webapp/src/components/Metrics.tsx
index bc18408..9e0c5ba 100644
--- a/webapp/src/components/Metrics.tsx
+++ b/webapp/src/components/Metrics.tsx
@@ -10,7 +10,14 @@ import {
   type MetricDeclaration,
   type MetricParamMatcher,
 } from '../lib/api'
-import { CollapseToggle, PopOutButton, sectionHeaderClassName, sectionHeaderLeftClassName, useSectionCollapsed } from './CollapsibleSection'
+import {
+  CollapseToggle,
+  handleSectionHeaderKeyDown,
+  PopOutButton,
+  sectionHeaderInteractiveClassName,
+  sectionHeaderLeftClassName,
+  useSectionCollapsed,
+} from './CollapsibleSection'
 import { HelpIcon } from './HelpIcon'
 
 const EMPTY_MATCHER: MetricParamMatcher = { param_name: '', capture_group: '', kind: 'string' }
@@ -151,13 +158,20 @@ export function Metrics({ range }: { range: TimeRange | null }) {
 
   return (
     <div className="border-b border-border text-sm">
-      <div className={sectionHeaderClassName}>
+      <div
+        className={sectionHeaderInteractiveClassName}
+        role="button"
+        tabIndex={0}
+        aria-expanded={!collapsed}
+        onClick={() => setCollapsed(!collapsed)}
+        onKeyDown={handleSectionHeaderKeyDown(() => setCollapsed(!collapsed))}
+      >
         <div className={sectionHeaderLeftClassName}>
           Metrics
           <HelpIcon sectionId="metrics" label="Help: Metrics" />
         </div>
         <div className="flex items-center gap-1.5">
-          <CollapseToggle collapsed={collapsed} onToggle={() => setCollapsed(!collapsed)} />
+          <CollapseToggle collapsed={collapsed} />
           <PopOutButton section="metrics" range={range} />
         </div>
       </div>
diff --git a/webapp/src/components/Params.tsx b/webapp/src/components/Params.tsx
index c7b2c8b..775da9f 100644
--- a/webapp/src/components/Params.tsx
+++ b/webapp/src/components/Params.tsx
@@ -1,6 +1,13 @@
 import { useState } from 'react'
 import { ApiError, declareParam, type ParamDeclaration } from '../lib/api'
-import { CollapseToggle, PopOutButton, sectionHeaderClassName, sectionHeaderLeftClassName, useSectionCollapsed } from './CollapsibleSection'
+import {
+  CollapseToggle,
+  handleSectionHeaderKeyDown,
+  PopOutButton,
+  sectionHeaderInteractiveClassName,
+  sectionHeaderLeftClassName,
+  useSectionCollapsed,
+} from './CollapsibleSection'
 import { HelpIcon } from './HelpIcon'
 
 const EMPTY_KIND: ParamDeclaration['kind'] = 'string'
@@ -34,13 +41,20 @@ export function Params({ params, onDeclared }: { params: ParamDeclaration[]; onD
 
   return (
     <div className="border-b border-border text-sm">
-      <div className={sectionHeaderClassName}>
+      <div
+        className={sectionHeaderInteractiveClassName}
+        role="button"
+        tabIndex={0}
+        aria-expanded={!collapsed}
+        onClick={() => setCollapsed(!collapsed)}
+        onKeyDown={handleSectionHeaderKeyDown(() => setCollapsed(!collapsed))}
+      >
         <div className={sectionHeaderLeftClassName}>
           Params
           <HelpIcon sectionId="parameters" label="Help: Params" />
         </div>
         <div className="flex items-center gap-1.5">
-          <CollapseToggle collapsed={collapsed} onToggle={() => setCollapsed(!collapsed)} />
+          <CollapseToggle collapsed={collapsed} />
           <PopOutButton section="params" />
         </div>
       </div>