diff --git a/components/generation/generation-toolbar.tsx b/components/generation/generation-toolbar.tsx
index 2298d35634..acd1925cc6 100644
--- a/components/generation/generation-toolbar.tsx
+++ b/components/generation/generation-toolbar.tsx
@@ -852,6 +852,7 @@ function ModelSettingsPopover({
 
   return (
     <Popover
+      modal={false}
       open={popoverOpen}
       onOpenChange={(nextOpen) => {
         setPopoverOpen(nextOpen);
@@ -981,6 +982,7 @@ function ModelSettingsPopover({
                     currentProviderId === provider.id && currentModelId === model.id;
                   const selectModel = () => {
                     setActiveProviderId(provider.id);
+                    setPopoverOpen(false);
                     setModel(provider.id, model.id);
                   };
                   return (
diff --git a/e2e/tests/model-picker-1447.spec.ts b/e2e/tests/model-picker-1447.spec.ts
new file mode 100644
index 0000000000..78bac39170
--- /dev/null
+++ b/e2e/tests/model-picker-1447.spec.ts
@@ -0,0 +1,131 @@
+import { test, expect } from '../fixtures/base';
+import { createSettingsStorage } from '../fixtures/test-data/settings';
+
+// These are deliberate repeated-open stress cases. Parallel dev-server runs
+// can spend most of the default 30s budget compiling before the ten cycles.
+test.describe.configure({ timeout: 60_000 });
+
+for (const method of ['click', 'Enter', 'Space']) {
+  test(`model picker selects and closes with ${method}`, async ({ page }) => {
+    const errors: string[] = [];
+    page.on('pageerror', (error) => errors.push(error.message));
+    await page.route('**/api/server-providers', (route) =>
+      route.fulfill({
+        json: {
+          providers: {
+            openai: { models: ['gpt-4o', 'gpt-4o-mini'] },
+            anthropic: { models: ['claude-sonnet-4-6'] },
+          },
+          tts: {},
+          asr: {},
+          pdf: {},
+          image: {},
+          video: {},
+          webSearch: {},
+        },
+      }),
+    );
+    await page.addInitScript(
+      (settings) => localStorage.setItem('maic:account:settings-storage', settings),
+      createSettingsStorage({ providersConfig: { openai: { apiKey: '' } } }),
+    );
+    await page.goto('/');
+    const picker = page.locator('button[aria-label*=" / "]').first();
+    await expect(picker).toBeVisible();
+    for (let i = 0; i < 10; i++) {
+      await picker.click();
+      const dialog = page.getByRole('dialog');
+      const modelId = i % 2 === 0 ? 'gpt-4o-mini' : 'gpt-4o';
+      const row = dialog
+        .locator('div[role="button"]')
+        .filter({ has: page.getByText(modelId, { exact: true }) });
+      if (method === 'click') await row.click();
+      else {
+        await row.focus();
+        await row.press(method);
+      }
+      await expect(dialog).toBeHidden();
+      await expect(picker).toHaveAttribute('aria-label', `OpenAI / ${modelId}`);
+    }
+    expect(errors).toEqual([]);
+  });
+}
+
+test('provider switch and nested thinking popup remain usable', async ({ page }) => {
+  const errors: string[] = [];
+  page.on('pageerror', (error) => errors.push(error.message));
+  await page.route('**/api/server-providers', (route) =>
+    route.fulfill({
+      json: {
+        providers: { openai: { models: ['gpt-4o'] }, anthropic: { models: ['claude-sonnet-4-6'] } },
+        tts: {},
+        asr: {},
+        pdf: {},
+        image: {},
+        video: {},
+        webSearch: {},
+      },
+    }),
+  );
+  await page.addInitScript(
+    (settings) => localStorage.setItem('maic:account:settings-storage', settings),
+    createSettingsStorage({ providersConfig: { openai: { apiKey: '' } } }),
+  );
+  await page.goto('/');
+  const picker = page.locator('button[aria-label*=" / "]').first();
+  await picker.click();
+  let dialog = page.getByRole('dialog');
+  await dialog.getByRole('button', { name: /Claude/ }).click();
+  await dialog.locator('div[role="button"]').filter({ hasText: 'claude-sonnet-4-6' }).click();
+  await expect(dialog).toBeHidden();
+  await expect(picker).toHaveAttribute('aria-label', /Claude/);
+  for (let i = 0; i < 10; i++) {
+    await picker.click();
+    dialog = page.getByRole('dialog');
+    await dialog.getByRole('combobox').first().click();
+    const options = page.getByRole('option');
+    await options.first().click();
+    await expect(dialog).toBeVisible();
+    await page.keyboard.press('Escape');
+    await expect(dialog).toBeHidden();
+  }
+  expect(errors).toEqual([]);
+});
+
+test('outside click closes and keyboard dismissal restores trigger focus', async ({ page }) => {
+  const errors: string[] = [];
+  page.on('pageerror', (error) => errors.push(error.message));
+  await page.route('**/api/server-providers', (route) =>
+    route.fulfill({
+      json: {
+        providers: { openai: { models: ['gpt-4o'] } },
+        tts: {},
+        asr: {},
+        pdf: {},
+        image: {},
+        video: {},
+        webSearch: {},
+      },
+    }),
+  );
+  await page.addInitScript(
+    (settings) => localStorage.setItem('maic:account:settings-storage', settings),
+    createSettingsStorage({ providersConfig: { openai: { apiKey: '' } } }),
+  );
+  await page.goto('/');
+  const picker = page.locator('button[aria-label*=" / "]').first();
+  await picker.click();
+  const dialog = page.getByRole('dialog');
+  await expect(dialog).toBeVisible();
+
+  await page.locator('body').click({ position: { x: 5, y: 5 } });
+
+  await expect(dialog).toBeHidden();
+
+  await picker.click();
+  await expect(dialog).toBeVisible();
+  await page.keyboard.press('Escape');
+  await expect(dialog).toBeHidden();
+  await expect(picker).toBeFocused();
+  expect(errors).toEqual([]);
+});