diff --git a/src/components/tasks/new-task-dialog.tsx b/src/components/tasks/new-task-dialog.tsx
index 4783e70..3b2b092 100644
--- a/src/components/tasks/new-task-dialog.tsx
+++ b/src/components/tasks/new-task-dialog.tsx
@@ -210,21 +210,50 @@ export function NewTaskDialog({
               </Popover>
             </div>
           </div>
-          <div>
-            <Label className="text-xs">Case</Label>
-            <Select value={caseId ?? "_none"} onValueChange={(v) => setCaseId(v === "_none" ? null : v)}>
-              <SelectTrigger>
-                <SelectValue placeholder="No case" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="_none">No case</SelectItem>
-                {cases.map((c) => (
-                  <SelectItem key={c.id} value={c.id}>
-                    {c.case_number} — {c.title}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
+          <div className="grid grid-cols-2 gap-3">
+            <div>
+              <Label className="text-xs">Client (optional)</Label>
+              <Select
+                value={clientId ?? "_none"}
+                onValueChange={(v) => {
+                  const next = v === "_none" ? null : v;
+                  setClientId(next);
+                  // Clear case if it doesn't belong to selected client
+                  if (next && caseId) {
+                    const k = cases.find((c) => c.id === caseId);
+                    if (k && k.client_id !== next) setCaseId(null);
+                  }
+                }}
+              >
+                <SelectTrigger>
+                  <SelectValue placeholder="No client" />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="_none">No client</SelectItem>
+                  {clients.map((c) => (
+                    <SelectItem key={c.id} value={c.id}>
+                      {c.name}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+            <div>
+              <Label className="text-xs">Case (optional)</Label>
+              <Select value={caseId ?? "_none"} onValueChange={(v) => setCaseId(v === "_none" ? null : v)}>
+                <SelectTrigger>
+                  <SelectValue placeholder="No case" />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="_none">No case</SelectItem>
+                  {filteredCases.map((c) => (
+                    <SelectItem key={c.id} value={c.id}>
+                      {c.case_number} — {c.title}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
           </div>
           <div>
             <Label className="text-xs">Assignees</Label>