diff --git a/.changeset/sweet-peaches-stare.md b/.changeset/sweet-peaches-stare.md
new file mode 100644
index 00000000..e23c7460
--- /dev/null
+++ b/.changeset/sweet-peaches-stare.md
@@ -0,0 +1,5 @@
+---
+"@usebruno/api-docs": patch
+---
+
+test(e2e): expand Playwright coverage for the theme switcher
diff --git a/packages/bruno-api-docs/e2e/tests/theming/theme-toggle.spec.ts b/packages/bruno-api-docs/e2e/tests/theming/theme-toggle.spec.ts
index 0e91881a..ff50bb7a 100644
--- a/packages/bruno-api-docs/e2e/tests/theming/theme-toggle.spec.ts
+++ b/packages/bruno-api-docs/e2e/tests/theming/theme-toggle.spec.ts
@@ -1,4 +1,5 @@
 import { test, expect } from '../../playwright';
+import { ThemeToggleComponent } from '../../components/layout/theme-toggle.component';
 
 /**
  * The header has one button that flips the whole app between light and dark.
@@ -6,14 +7,15 @@ import { test, expect } from '../../playwright';
 test.describe('Theme switcher', () => {
   test.use({ colorScheme: 'light' });
 
-  test.beforeEach(async ({ page }) => {
-    await page.goto('/');
-  });
+  test.describe('when the OS prefers light', () => {
+    test.beforeEach(async ({ page }) => {
+      await page.goto('/');
+    });
 
-  test('starts in light mode, with the toggle offering "Switch to dark theme"', async ({ page, themeToggle }) => {
-    await expect(page.locator('html')).toHaveAttribute('data-theme', 'light');
-    await expect(themeToggle.button).toHaveAccessibleName('Switch to dark theme');
-  });
+    test('starts in light mode, with the toggle offering "Switch to dark theme"', async ({ page, themeToggle }) => {
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'light');
+      await expect(themeToggle.button).toHaveAccessibleName('Switch to dark theme');
+    });
 
   test('names the action in a tooltip on hover', async ({ themeToggle }) => {
     await themeToggle.button.hover();
@@ -24,22 +26,87 @@ test.describe('Theme switcher', () => {
   test('switches the whole app to dark mode when the toggle is clicked', async ({ page, themeToggle }) => {
     await themeToggle.toggle();
 
-    await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark');
-    // The toggle now offers the opposite action.
-    await expect(themeToggle.button).toHaveAccessibleName('Switch to light theme');
-  });
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark');
 
-  test('switches back to light mode when the toggle is clicked again', async ({ page, themeToggle }) => {
-    await themeToggle.toggle();
-    await themeToggle.toggle();
+      await expect(themeToggle.button).toHaveAccessibleName('Switch to light theme');
+    });
+
+    test('switches back to light mode when the toggle is clicked again', async ({ page, themeToggle }) => {
+      await themeToggle.toggle();
+      await themeToggle.toggle();
+
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'light');
+    });
+
+    test('remembers the chosen theme across a page reload', async ({ page, themeToggle }) => {
+      await themeToggle.toggle();
+      await page.reload();
+
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark');
+    });
+
+    test('remembers the chosen theme across Overview, Environments, and a request', async ({
+      page,
+      sidebar,
+      themeToggle,
+      overviewPage,
+      environmentsPage,
+      requestPage
+    }) => {
+      await themeToggle.toggle();
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark');
 
-    await expect(page.locator('html')).toHaveAttribute('data-theme', 'light');
+      await sidebar.overview.click();
+      await expect(overviewPage.root).toBeVisible();
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark');
+
+      await sidebar.environments.click();
+      await expect(environmentsPage.root).toBeVisible();
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark');
+
+      await sidebar.open(['echo json']);
+      await expect(requestPage.root).toBeVisible();
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark');
+      await expect(themeToggle.button).toHaveAccessibleName('Switch to light theme');
+    });
+
+    test('remembers the chosen theme when the doc is opened in a new tab', async ({
+      page,
+      context,
+      themeToggle
+    }) => {
+      await themeToggle.toggle();
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark');
+
+      const reopened = await context.newPage();
+      await reopened.goto('/');
+      const reopenedToggle = new ThemeToggleComponent(reopened);
+
+      await expect(reopened.locator('html')).toHaveAttribute('data-theme', 'dark');
+      await expect(reopenedToggle.button).toHaveAccessibleName('Switch to light theme');
+    });
   });
 
-  test('remembers the chosen theme across a page reload', async ({ page, themeToggle }) => {
-    await themeToggle.toggle();
-    await page.reload();
+  test.describe('when the OS prefers dark', () => {
+    test.use({ colorScheme: 'dark' });
+
+    test.beforeEach(async ({ page }) => {
+      await page.goto('/');
+    });
+
+    test('starts in dark mode, with the toggle offering "Switch to light theme"', async ({ page, themeToggle }) => {
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark');
+      await expect(themeToggle.button).toHaveAccessibleName('Switch to light theme');
+    });
+
+    test('keeps an explicit light choice after reload, even though the OS prefers dark', async ({ page, themeToggle }) => {
+      await themeToggle.toggle();
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'light');
+
+      await page.reload();
 
-    await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark');
+      await expect(page.locator('html')).toHaveAttribute('data-theme', 'light');
+      await expect(themeToggle.button).toHaveAccessibleName('Switch to dark theme');
+    });
   });
 });