diff --git a/apps/web/src/components/tasks/ModelSelect.search.client.test.tsx b/apps/web/src/components/tasks/ModelSelect.search.client.test.tsx
index ddd9ac65a..3527c3c0f 100644
--- a/apps/web/src/components/tasks/ModelSelect.search.client.test.tsx
+++ b/apps/web/src/components/tasks/ModelSelect.search.client.test.tsx
@@ -35,6 +35,20 @@ beforeEach(() => {
 });
 
 describe('ModelSelect real controls', () => {
+  it.each([undefined, 'Environment setup model', 'Coding model'])(
+    'names the focused search input using the picker context %s',
+    async (ariaLabel) => {
+      render(<ModelSelect ariaLabel={ariaLabel} onValueChange={vi.fn()} />);
+      fireEvent.click(screen.getByRole('combobox'));
+
+      const input = await screen.findByRole('combobox', {
+        name: ariaLabel ?? 'Model',
+      });
+      expect(input.tagName).toBe('INPUT');
+      expect(input).toHaveFocus();
+    },
+  );
+
   it.each([undefined, 'Use default'])(
     'keeps eight models on Select with empty option %s',
     (emptyOptionLabel) => {
diff --git a/apps/web/src/components/tasks/ModelSelect.tsx b/apps/web/src/components/tasks/ModelSelect.tsx
index b4bfc8b40..b50300874 100644
--- a/apps/web/src/components/tasks/ModelSelect.tsx
+++ b/apps/web/src/components/tasks/ModelSelect.tsx
@@ -117,7 +117,7 @@ export function ModelSelect({
           align="start"
           className="w-(--radix-popover-trigger-width) p-0"
         >
-          <Command>
+          <Command label={ariaLabel}>
             <CommandInput placeholder="Search models..." />
             <CommandList>
               <CommandEmpty>No models found.</CommandEmpty>