diff --git a/docs/design-system/COMPONENTS.md b/docs/design-system/COMPONENTS.md
index 3c97e63937..9e79fed409 100644
--- a/docs/design-system/COMPONENTS.md
+++ b/docs/design-system/COMPONENTS.md
@@ -976,7 +976,7 @@ This generated snapshot is a local source-derived inventory. It does not assert
 | `AnswerFooter`           | answer   | yes   | yes                | inherited-global-root | yes            | no                 |               1 |
 | `AsyncButton`            | controls | yes   | yes                | inherited-global-root | yes            | no                 |               4 |
 | `Breadcrumb`             | layout   | yes   | yes                | inherited-global-root | yes            | no                 |               1 |
-| `Button`                 | controls | yes   | yes                | inherited-global-root | yes            | no                 |              16 |
+| `Button`                 | controls | yes   | yes                | inherited-global-root | yes            | no                 |              17 |
 | `Checkbox`               | controls | yes   | yes                | no                    | yes            | no                 |               0 |
 | `Chip`                   | controls | yes   | yes                | inherited-global-root | yes            | no                 |               5 |
 | `ChoiceChip`             | controls | yes   | yes                | inherited-global-root | yes            | no                 |               4 |
@@ -1012,7 +1012,7 @@ This generated snapshot is a local source-derived inventory. It does not assert
 | `SearchField`            | controls | yes   | yes                | no                    | yes            | no                 |               0 |
 | `SegmentedControl`       | controls | yes   | yes                | inherited-global-root | yes            | no                 |               8 |
 | `Select`                 | controls | yes   | yes                | inherited-global-root | yes            | no                 |               2 |
-| `Sheet`                  | layout   | yes   | yes                | inherited-global-root | yes            | no                 |              30 |
+| `Sheet`                  | layout   | yes   | yes                | inherited-global-root | yes            | no                 |              31 |
 | `Skeleton`               | feedback | yes   | yes                | inherited-global-root | yes            | no                 |               6 |
 | `SourceDesignationBadge` | source   | yes   | yes                | inherited-global-root | yes            | no                 |               4 |
 | `SourceProvenance`       | source   | yes   | yes                | inherited-global-root | yes            | no                 |               1 |
diff --git a/docs/design-system/adoption-manifest.json b/docs/design-system/adoption-manifest.json
index efa4e37396..05be5ff13c 100644
--- a/docs/design-system/adoption-manifest.json
+++ b/docs/design-system/adoption-manifest.json
@@ -281,6 +281,7 @@
         "src/components/AccessibleTable.tsx",
         "src/components/clinical-dashboard/signed-image.tsx",
         "src/components/privacy-quiet-signal-page.tsx",
+        "src/components/therapy-compass/recommend-scenario-control.tsx",
         "src/components/therapy-compass/record/compare-action.tsx",
         "src/components/therapy-compass/screens/brief-screen.tsx",
         "src/components/therapy-compass/screens/compare-screen.tsx",
@@ -299,6 +300,7 @@
         "src/components/AccessibleTable.tsx",
         "src/components/clinical-dashboard/signed-image.tsx",
         "src/components/privacy-quiet-signal-page.tsx",
+        "src/components/therapy-compass/recommend-scenario-control.tsx",
         "src/components/therapy-compass/record/compare-action.tsx",
         "src/components/therapy-compass/screens/brief-screen.tsx",
         "src/components/therapy-compass/screens/compare-screen.tsx",
@@ -423,13 +425,13 @@
       "directImportFiles": [
         "src/components/clinical-dashboard/patient-profile-panel.tsx",
         "src/components/clinical-dashboard/result-filter-control.tsx",
-        "src/components/therapy-compass/screens/recommend-screen.tsx",
+        "src/components/therapy-compass/recommend-scenario-fields.tsx",
         "src/components/therapy-compass/screens/sheets-screen.tsx"
       ],
       "productImportFiles": [
         "src/components/clinical-dashboard/patient-profile-panel.tsx",
         "src/components/clinical-dashboard/result-filter-control.tsx",
-        "src/components/therapy-compass/screens/recommend-screen.tsx",
+        "src/components/therapy-compass/recommend-scenario-fields.tsx",
         "src/components/therapy-compass/screens/sheets-screen.tsx"
       ],
       "designSync": {
@@ -1661,6 +1663,7 @@
         "src/components/forms/form-priority-facts-section.tsx",
         "src/components/in-page-nav/in-page-nav-header.tsx",
         "src/components/mode-nav/mode-nav.tsx",
+        "src/components/therapy-compass/recommend-scenario-control.tsx",
         "src/components/therapy-compass/record/key-facts.tsx",
         "src/components/therapy-compass/therapy-compare-tray.tsx",
         "src/components/tools/tools-search-results-page.tsx",
@@ -1694,6 +1697,7 @@
         "src/components/forms/form-priority-facts-section.tsx",
         "src/components/in-page-nav/in-page-nav-header.tsx",
         "src/components/mode-nav/mode-nav.tsx",
+        "src/components/therapy-compass/recommend-scenario-control.tsx",
         "src/components/therapy-compass/record/key-facts.tsx",
         "src/components/therapy-compass/therapy-compare-tray.tsx",
         "src/components/tools/tools-search-results-page.tsx",
diff --git a/src/components/therapy-compass/recommend-scenario-control.tsx b/src/components/therapy-compass/recommend-scenario-control.tsx
new file mode 100644
index 0000000000..994fb6bf5d
--- /dev/null
+++ b/src/components/therapy-compass/recommend-scenario-control.tsx
@@ -0,0 +1,143 @@
+"use client";
+
+import { useId, useRef, useState } from "react";
+import { Pencil, Sparkles } from "lucide-react";
+
+import { Button } from "@/components/ui/button";
+import { InteractiveRow } from "@/components/ui/interactive-row";
+import { Sheet } from "@/components/ui/sheet";
+import { cn } from "@/components/ui-primitives";
+
+import { RECOMMEND_CONSTRAINTS } from "./data/select";
+import { RecommendScenarioFields, type RecommendScenarioFieldsProps } from "./recommend-scenario-fields";
+
+type RecommendScenarioControlProps = RecommendScenarioFieldsProps & {
+  loading: boolean;
+  matchCount: number;
+};
+
+const PLACEHOLDER = "Describe the clinical situation…";
+
+function truncatePreview(text: string, maxLength = 72) {
+  const trimmed = text.trim();
+  if (!trimmed) return "";
+  if (trimmed.length <= maxLength) return trimmed;
+  return `${trimmed.slice(0, maxLength - 1).trimEnd()}…`;
+}
+
+export function RecommendScenarioControl({
+  recQuery,
+  setRecQuery,
+  isConstraintActive,
+  isConstraintInferred,
+  toggleConstraint,
+  idPrefix,
+  loading,
+  matchCount,
+}: RecommendScenarioControlProps) {
+  const [sheetOpen, setSheetOpen] = useState(false);
+  const panelId = useId();
+  const triggerRef = useRef<HTMLButtonElement>(null);
+
+  const activeConstraintCount = RECOMMEND_CONSTRAINTS.filter((constraint) => isConstraintActive(constraint.key)).length;
+  const preview = truncatePreview(recQuery);
+  const matchLabel = loading
+    ? "Ranking clinical matches…"
+    : `${matchCount} ranked ${matchCount === 1 ? "match" : "matches"}`;
+
+  return (
+    <div className="mb-6 sm:hidden">
+      <InteractiveRow
+        ref={triggerRef}
+        type="button"
+        testId="therapy-recommend-scenario-trigger"
+        aria-expanded={sheetOpen}
+        aria-haspopup="dialog"
+        aria-controls={sheetOpen ? panelId : undefined}
+        onClick={() => setSheetOpen(true)}
+        className="w-full gap-3 px-3 py-2.5"
+      >
+        <span
+          aria-hidden="true"
+          className="grid size-9 shrink-0 place-items-center rounded-lg bg-[color:var(--surface-subtle)] text-[color:var(--clinical-accent)]"
+        >
+          {preview ? (
+            <Pencil aria-hidden="true" className="size-icon-md" />
+          ) : (
+            <Sparkles aria-hidden="true" className="size-icon-md" />
+          )}
+        </span>
+        <span className="min-w-0 flex-1">
+          <span className="block text-xs font-semibold text-[color:var(--text-heading)]">Clinical scenario</span>
+          <span
+            className={cn(
+              "mt-0.5 block truncate text-sm leading-snug",
+              preview ? "text-[color:var(--text)]" : "text-[color:var(--text-muted)]",
+            )}
+          >
+            {preview || PLACEHOLDER}
+          </span>
+        </span>
+        {activeConstraintCount > 0 ? (
+          <span className="search-band-badge nums grid h-search-band-badge min-w-search-band-badge shrink-0 place-items-center rounded-full bg-[color:var(--search-band-badge-bg)] px-1 text-2xs font-bold text-[color:var(--clinical-accent)]">
+            {activeConstraintCount}
+          </span>
+        ) : null}
+        <span className="sr-only">
+          {activeConstraintCount > 0
+            ? `${activeConstraintCount} constraint${activeConstraintCount === 1 ? "" : "s"} active`
+            : "No constraints active"}
+          . Opens clinical scenario editor.
+        </span>
+      </InteractiveRow>
+
+      <Sheet
+        open={sheetOpen}
+        onClose={() => setSheetOpen(false)}
+        returnFocusRef={triggerRef}
+        title="Clinical scenario"
+        descriptionContent={
+          <p className="text-xs font-medium leading-5 text-[color:var(--text-muted)]">
+            Describe the presentation and constraints. Rankings update as you type.
+          </p>
+        }
+        headerClassName="items-start px-4 py-3 sm:px-5 sm:py-3.5"
+        titleClassName="text-base sm:text-lg"
+        closeButtonClassName={cn(
+          "grid h-tap w-tap shrink-0 place-items-center rounded-lg text-[color:var(--text-muted)] transition hover:bg-[color:var(--surface-subtle)] hover:text-[color:var(--text)] motion-reduce:transition-none",
+          "focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
+        )}
+        portal
+        placement="responsive-right"
+        id={panelId}
+        testId="therapy-recommend-scenario-panel"
+        footer={
+          <div className="flex flex-wrap items-center justify-between gap-2">
+            <span aria-live="polite" className="min-w-0 text-xs font-semibold text-[color:var(--text-muted)]">
+              {matchLabel}
+            </span>
+            <Button
+              variant="primary"
+              size="sm"
+              testId="therapy-recommend-scenario-done"
+              onClick={() => setSheetOpen(false)}
+            >
+              Done
+            </Button>
+          </div>
+        }
+      >
+        <form data-therapy-recommend-composer className="min-w-0" onSubmit={(event) => event.preventDefault()}>
+          <RecommendScenarioFields
+            recQuery={recQuery}
+            setRecQuery={setRecQuery}
+            isConstraintActive={isConstraintActive}
+            isConstraintInferred={isConstraintInferred}
+            toggleConstraint={toggleConstraint}
+            idPrefix={idPrefix}
+          />
+        </form>
+      </Sheet>
+    </div>
+  );
+}
diff --git a/src/components/therapy-compass/recommend-scenario-fields.tsx b/src/components/therapy-compass/recommend-scenario-fields.tsx
new file mode 100644
index 0000000000..01a9275faa
--- /dev/null
+++ b/src/components/therapy-compass/recommend-scenario-fields.tsx
@@ -0,0 +1,80 @@
+"use client";
+
+import { cn, eyebrowText, searchShell, searchShellInput } from "@/components/ui-primitives";
+import { ChoiceChip } from "@/components/ui/chip";
+
+import { RECOMMEND_CONSTRAINT_GROUPS, RECOMMEND_CONSTRAINTS } from "./data/select";
+
+export type RecommendScenarioFieldsProps = {
+  recQuery: string;
+  setRecQuery: (q: string) => void;
+  isConstraintActive: (key: string) => boolean;
+  isConstraintInferred: (key: string) => boolean;
+  toggleConstraint: (key: string) => void;
+  /** Prefix for label/input ids — must be unique per mount (desktop vs sheet). */
+  idPrefix: string;
+};
+
+export function RecommendScenarioFields({
+  recQuery,
+  setRecQuery,
+  isConstraintActive,
+  isConstraintInferred,
+  toggleConstraint,
+  idPrefix,
+}: RecommendScenarioFieldsProps) {
+  const situationId = `${idPrefix}-rec-q`;
+
+  return (
+    <>
+      <label htmlFor={situationId} className="block text-xs font-semibold text-[color:var(--text-heading)]">
+        Clinical situation
+      </label>
+      <div className={cn(searchShell, "mt-2 min-w-0 bg-[color:var(--surface)] px-2.5 py-2")}>
+        <textarea
+          id={situationId}
+          value={recQuery}
+          onChange={(event) => setRecQuery(event.target.value)}
+          placeholder="e.g. 28-year-old with panic attacks in outpatient clinic, 15 minutes available, no trauma work yet"
+          className={cn(
+            searchShellInput,
+            "min-h-20 resize-y py-1.5 text-base leading-normal text-[color:var(--text)] sm:text-sm",
+          )}
+        />
+      </div>
+
+      <div className="mt-5 grid grid-cols-1 gap-4 sm:grid-cols-2">
+        {RECOMMEND_CONSTRAINT_GROUPS.map((group) => {
+          const chips = RECOMMEND_CONSTRAINTS.filter((constraint) => constraint.group === group.id);
+          return (
+            <fieldset key={group.id} className="min-w-0">
+              <legend className={cn(eyebrowText, "mb-2 px-0")}>{group.label}</legend>
+              <div className="flex flex-wrap gap-2">
+                {chips.map((constraint) => {
+                  const active = isConstraintActive(constraint.key);
+                  const inferred = isConstraintInferred(constraint.key);
+                  return (
+                    <ChoiceChip
+                      key={constraint.key}
+                      pressed={active}
+                      onPressedChange={() => toggleConstraint(constraint.key)}
+                      title={inferred ? `${constraint.label} — inferred from the situation` : undefined}
+                    >
+                      {constraint.label}
+                    </ChoiceChip>
+                  );
+                })}
+              </div>
+            </fieldset>
+          );
+        })}
+      </div>
+
+      {RECOMMEND_CONSTRAINTS.some((constraint) => isConstraintInferred(constraint.key)) ? (
+        <p className="mt-3 text-xs text-[color:var(--text-muted)]">
+          From the situation: accent chips were inferred from the typed presentation. Toggle any chip to override.
+        </p>
+      ) : null}
+    </>
+  );
+}
diff --git a/src/components/therapy-compass/screens/recommend-screen.tsx b/src/components/therapy-compass/screens/recommend-screen.tsx
index 13d9365725..589704d596 100644
--- a/src/components/therapy-compass/screens/recommend-screen.tsx
+++ b/src/components/therapy-compass/screens/recommend-screen.tsx
@@ -1,15 +1,17 @@
 "use client";
 
+import { useId } from "react";
 import { Check, Copy, Search, Shield, Sparkles } from "lucide-react";
 
 import { cardPadding, cardSurface } from "@/components/card-recipes";
 import { PageHeader } from "@/components/ui/page-header";
-import { cn, eyebrowText, pageContainer } from "@/components/ui-primitives";
+import { cn, pageContainer } from "@/components/ui-primitives";
 import { Button } from "@/components/ui/button";
-import { ChoiceChip } from "@/components/ui/chip";
 
 import { useTcBindings } from "../bindings";
-import { RECOMMEND_CONSTRAINT_GROUPS, RECOMMEND_CONSTRAINTS } from "../data/select";
+import { RECOMMEND_CONSTRAINTS } from "../data/select";
+import { RecommendScenarioControl } from "../recommend-scenario-control";
+import { RecommendScenarioFields } from "../recommend-scenario-fields";
 import { ResultCard } from "../therapy-card";
 import { EmptyState, LoadingState } from "../ui";
 import { useClipboard } from "../use-clipboard";
@@ -20,6 +22,7 @@ export function RecommendScreen() {
   const ranked = b.recommendations;
   const top = ranked[0];
   const rest = ranked.slice(1);
+  const desktopIdPrefix = useId();
 
   const copyShortlist = () =>
     copy(
@@ -39,85 +42,39 @@ export function RecommendScreen() {
       "shortlist",
     );
 
+  const matchLabel = b.loading
+    ? "Ranking clinical matches…"
+    : `${ranked.length} ranked ${ranked.length === 1 ? "match" : "matches"}`;
+
+  const scenarioBindings = {
+    recQuery: b.recQuery,
+    setRecQuery: b.setRecQuery,
+    isConstraintActive: b.isConstraintActive,
+    isConstraintInferred: b.isConstraintInferred,
+    toggleConstraint: b.toggleConstraint,
+  };
+
   return (
     <section data-screen-label="Recommend" className={pageContainer}>
       <PageHeader
-        className="mb-6"
-        eyebrow="Therapy Compass"
-        icon={Sparkles}
-        title="Recommend a therapy"
-        description="Describe the clinical situation. Catalogue matches rank by presentation, setting, time and cautions — advisory, not a protocol. Confirm fit and review status before use."
+        className="mb-5 sm:mb-6"
+        title="Recommend"
+        description="Rank catalogue therapies against a clinical scenario — advisory only."
+      />
+
+      <RecommendScenarioControl
+        {...scenarioBindings}
+        idPrefix="tc-mobile"
+        loading={b.loading}
+        matchCount={ranked.length}
       />
 
       <form
         data-therapy-recommend-composer
-        className={cn(cardSurface, cardPadding.standard, "mb-8 sm:p-5")}
+        className={cn(cardSurface, cardPadding.compact, "mb-6 hidden sm:mb-8 sm:block sm:p-4")}
         onSubmit={(event) => event.preventDefault()}
       >
-        <label htmlFor="tc-rec-q" className="block text-xs font-semibold text-[color:var(--text-heading)]">
-          Clinical situation
-        </label>
-        <textarea
-          id="tc-rec-q"
-          value={b.recQuery}
-          onChange={(event) => b.setRecQuery(event.target.value)}
-          placeholder="e.g. 28-year-old with panic attacks in outpatient clinic, 15 minutes available, no trauma work yet"
-          className="mt-2 w-full min-h-20 resize-y rounded-lg border border-[color:var(--border-strong)] bg-[color:var(--surface)] px-3.5 py-3 text-base-minus leading-normal text-[color:var(--text)]"
-        />
-
-        <div className="mt-5 grid grid-cols-1 gap-4 sm:grid-cols-2">
-          {RECOMMEND_CONSTRAINT_GROUPS.map((group) => {
-            const chips = RECOMMEND_CONSTRAINTS.filter((constraint) => constraint.group === group.id);
-            return (
-              <fieldset key={group.id} className="min-w-0">
-                <legend className={cn(eyebrowText, "mb-2 px-0")}>{group.label}</legend>
-                <div className="flex flex-wrap gap-2">
-                  {chips.map((constraint) => {
-                    const active = b.isConstraintActive(constraint.key);
-                    const inferred = b.isConstraintInferred(constraint.key);
-                    return (
-                      <ChoiceChip
-                        key={constraint.key}
-                        pressed={active}
-                        onPressedChange={() => b.toggleConstraint(constraint.key)}
-                        title={inferred ? `${constraint.label} — inferred from the situation` : undefined}
-                      >
-                        {constraint.label}
-                      </ChoiceChip>
-                    );
-                  })}
-                </div>
-              </fieldset>
-            );
-          })}
-        </div>
-
-        {RECOMMEND_CONSTRAINTS.some((constraint) => b.isConstraintInferred(constraint.key)) ? (
-          <p className="mt-3 text-xs text-[color:var(--text-muted)]">
-            From the situation: accent chips were inferred from the typed presentation. Toggle any chip to override.
-          </p>
-        ) : null}
-
-        <div className="mt-5 flex flex-wrap items-center justify-between gap-3">
-          <p className="text-xs font-semibold text-[color:var(--text-muted)]" aria-live="polite">
-            {b.loading
-              ? "Ranking clinical matches…"
-              : `${ranked.length} ranked ${ranked.length === 1 ? "match" : "matches"}`}
-          </p>
-          <div className="flex flex-wrap items-center gap-2">
-            <Button
-              variant="secondary"
-              icon={copied === "shortlist" ? Check : Copy}
-              onClick={copyShortlist}
-              disabled={!ranked.length}
-            >
-              {copied === "shortlist" ? "Copied" : "Copy shortlist"}
-            </Button>
-            <Button variant="secondary" icon={Search} onClick={b.goSearch}>
-              Refine in catalogue
-            </Button>
-          </div>
-        </div>
+        <RecommendScenarioFields {...scenarioBindings} idPrefix={desktopIdPrefix} />
       </form>
 
       {b.loading && !top ? (
@@ -130,8 +87,28 @@ export function RecommendScreen() {
         />
       ) : (
         <>
-          <div className="mb-3.5 text-base-minus font-semibold text-[color:var(--text-heading)]">
-            Ranked clinical matches
+          <div className="mb-3.5 flex flex-wrap items-center justify-between gap-3">
+            <div className="min-w-0">
+              <div className="text-base-minus font-semibold text-[color:var(--text-heading)]">
+                Ranked clinical matches
+              </div>
+              <p className="mt-0.5 text-xs font-semibold text-[color:var(--text-muted)]" aria-live="polite">
+                {matchLabel}
+              </p>
+            </div>
+            <div className="flex flex-wrap items-center gap-2">
+              <Button
+                variant="secondary"
+                icon={copied === "shortlist" ? Check : Copy}
+                onClick={copyShortlist}
+                disabled={!ranked.length}
+              >
+                {copied === "shortlist" ? "Copied" : "Copy shortlist"}
+              </Button>
+              <Button variant="secondary" icon={Search} onClick={b.goSearch}>
+                Refine in catalogue
+              </Button>
+            </div>
           </div>
           <div className="flex flex-col gap-3">
             <ResultCard
diff --git a/tests/recommend-screen.dom.test.tsx b/tests/recommend-screen.dom.test.tsx
index 79759ac2aa..fcb3f0d1c5 100644
--- a/tests/recommend-screen.dom.test.tsx
+++ b/tests/recommend-screen.dom.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen, within } from "@testing-library/react";
+import { fireEvent, render, screen, within } from "@testing-library/react";
 import { describe, expect, it, vi } from "vitest";
 
 import type { Therapy } from "@/components/therapy-compass/data/types";
@@ -55,20 +55,39 @@ const therapy = {
 } as Therapy;
 
 describe("Recommend screen", () => {
-  it("owns an in-flow situation composer and grouped constraint chips", () => {
+  it("uses a minimal header and mobile scenario trigger with sheet editor", () => {
+    bindings.recommendations = [{ therapy, score: 40, reasons: ["Matches the described presentation"] }];
+    render(<RecommendScreen />);
+
+    expect(screen.getByRole("heading", { name: "Recommend" })).toBeInTheDocument();
+    expect(screen.queryByRole("heading", { name: "Recommend a therapy" })).not.toBeInTheDocument();
+
+    const trigger = screen.getByTestId("therapy-recommend-scenario-trigger");
+    expect(trigger).toHaveAttribute("aria-expanded", "false");
+    fireEvent.click(trigger);
+    expect(trigger).toHaveAttribute("aria-expanded", "true");
+
+    const panel = screen.getByTestId("therapy-recommend-scenario-panel");
+    expect(within(panel).getByLabelText("Clinical situation")).toBeInTheDocument();
+    expect(within(panel).getByRole("group", { name: "Setting" })).toBeInTheDocument();
+    expect(within(panel).getByRole("group", { name: "Time" })).toBeInTheDocument();
+    expect(within(panel).getByRole("group", { name: "Support" })).toBeInTheDocument();
+    expect(within(panel).getByRole("group", { name: "Cautions" })).toBeInTheDocument();
+    expect(within(panel).getByRole("button", { name: "Outpatient" })).toHaveAttribute("aria-pressed", "true");
+    expect(within(panel).getByText(/From the situation/)).toBeInTheDocument();
+    expect(within(panel).getByTestId("therapy-recommend-scenario-done")).toBeInTheDocument();
+  });
+
+  it("keeps desktop inline fieldsets and moves actions to the results toolbar", () => {
     bindings.recommendations = [{ therapy, score: 40, reasons: ["Matches the described presentation"] }];
     render(<RecommendScreen />);
 
-    expect(screen.getByRole("heading", { name: "Recommend a therapy" })).toBeInTheDocument();
-    expect(screen.queryByRole("heading", { name: "Recommend Tool" })).not.toBeInTheDocument();
-    expect(screen.getByLabelText("Clinical situation")).toHaveAttribute("id", "tc-rec-q");
     expect(document.querySelector("[data-therapy-recommend-composer]")).not.toBeNull();
-    expect(screen.getByRole("group", { name: "Setting" })).toBeInTheDocument();
-    expect(screen.getByRole("group", { name: "Time" })).toBeInTheDocument();
-    expect(screen.getByRole("group", { name: "Support" })).toBeInTheDocument();
-    expect(screen.getByRole("group", { name: "Cautions" })).toBeInTheDocument();
-    expect(screen.getByRole("button", { name: "Outpatient" })).toHaveAttribute("aria-pressed", "true");
-    expect(screen.getByText(/From the situation/)).toBeInTheDocument();
+
+    expect(screen.getAllByRole("group", { name: "Setting" }).length).toBeGreaterThanOrEqual(1);
+    expect(screen.getAllByRole("group", { name: "Time" }).length).toBeGreaterThanOrEqual(1);
+    expect(screen.getAllByRole("group", { name: "Support" }).length).toBeGreaterThanOrEqual(1);
+    expect(screen.getAllByRole("group", { name: "Cautions" }).length).toBeGreaterThanOrEqual(1);
     expect(screen.getByRole("button", { name: "Copy shortlist" })).toBeEnabled();
     expect(screen.getByRole("button", { name: "Refine in catalogue" })).toBeInTheDocument();
     expect(screen.getByText("1 ranked match")).toBeInTheDocument();
diff --git a/tests/therapy-compass-responsive-contract.test.ts b/tests/therapy-compass-responsive-contract.test.ts
index 069bf54793..7d5d3fd3c3 100644
--- a/tests/therapy-compass-responsive-contract.test.ts
+++ b/tests/therapy-compass-responsive-contract.test.ts
@@ -21,6 +21,7 @@ const detailSource = read(`${therapyPath}/screens/detail-screen.tsx`);
 const keyFactsSource = read(`${therapyPath}/record/key-facts.tsx`);
 const compareSource = read(`${therapyPath}/screens/compare-screen.tsx`);
 const recommendSource = read(`${therapyPath}/screens/recommend-screen.tsx`);
+const recommendFieldsSource = read(`${therapyPath}/recommend-scenario-fields.tsx`);
 const pathwaysSource = read(`${therapyPath}/screens/pathways-screen.tsx`);
 const briefSource = read(`${therapyPath}/screens/brief-screen.tsx`);
 const sheetsSource = read(`${therapyPath}/screens/sheets-screen.tsx`);
@@ -180,7 +181,9 @@ describe("Therapy Compass responsive contract", () => {
     expect(compareSource).toContain("md:block");
     expect(compareSource).toContain('data-testid="therapy-compare-stack"');
     expect(compareSource).toContain("md:hidden");
-    expect(responsiveStackCount(recommendSource)).toBeGreaterThanOrEqual(1);
+    expect(responsiveStackCount(recommendSource) + responsiveStackCount(recommendFieldsSource)).toBeGreaterThanOrEqual(
+      1,
+    );
     expect(responsiveStackCount(pathwaysSource)).toBeGreaterThanOrEqual(1);
     expect(pathwaysSource).toContain("therapy-pathway-list");
     expect(responsiveStackCount(briefSource)).toBeGreaterThanOrEqual(1);