diff --git a/src/components/tasks/new-task-dialog.tsx b/src/components/tasks/new-task-dialog.tsx
index 93ee063..15058ed 100644
--- a/src/components/tasks/new-task-dialog.tsx
+++ b/src/components/tasks/new-task-dialog.tsx
@@ -214,46 +214,42 @@ export function NewTaskDialog({
-
+ placeholder="No client"
+ searchPlaceholder="Search clients…"
+ emptyText="No clients found."
+ options={[
+ { value: "_none", label: "No client" },
+ ...clients.map((c) => ({ value: c.id, label: c.name, keywords: c.name })),
+ ]}
+ />
-
+ setCaseId(v === "_none" ? null : v)}
+ placeholder="No case"
+ searchPlaceholder="Search cases…"
+ emptyText="No cases found."
+ options={[
+ { value: "_none", label: "No case" },
+ ...filteredCases.map((c) => ({
+ value: c.id,
+ label: `${c.case_number} — ${c.title}`,
+ keywords: `${c.case_number} ${c.title}`,
+ })),
+ ]}
+ />
diff --git a/src/routes/cases.new.tsx b/src/routes/cases.new.tsx
index 9f1e63d..156db0e 100644
--- a/src/routes/cases.new.tsx
+++ b/src/routes/cases.new.tsx
@@ -112,13 +112,17 @@ function NewCase() {
-
+ setForm({ ...form, client_id: v === "__none" ? "" : v })}
+ placeholder="No client"
+ searchPlaceholder="Search clients…"
+ emptyText="No clients found."
+ options={[
+ { value: "__none", label: "No client (attach later)" },
+ ...clients.map((c) => ({ value: c.id, label: c.name, keywords: c.name })),
+ ]}
+ />
diff --git a/src/routes/status.index.tsx b/src/routes/status.index.tsx
index 78395d8..37fd7aa 100644
--- a/src/routes/status.index.tsx
+++ b/src/routes/status.index.tsx
@@ -110,19 +110,18 @@ function StatusUpdatesPage() {