diff --git a/src/firefox/index.ts b/src/firefox/index.ts
index d5460be..7708d13 100644
--- a/src/firefox/index.ts
+++ b/src/firefox/index.ts
@@ -398,6 +398,14 @@ export class FirefoxClient {
     return this.core.getCurrentContextId();
   }
 
+  /**
+   * Update current browsing context ID
+   * @internal
+   */
+  setCurrentContextId(contextId: string): void {
+    this.core.setCurrentContextId(contextId);
+  }
+
   /**
    * Check if Firefox is still connected and responsive
    * Returns false if Firefox was closed or connection is broken
diff --git a/src/tools/firefox-prefs.ts b/src/tools/firefox-prefs.ts
index d7d478e..40b9ccb 100644
--- a/src/tools/firefox-prefs.ts
+++ b/src/tools/firefox-prefs.ts
@@ -97,10 +97,10 @@ export async function handleSetFirefoxPrefs(args: unknown): Promise<McpToolRespo
 
       return successResponse(output.join('\n'));
     } finally {
-      // Restore content context
+      // Restore previous context (skip if already on the right chrome context)
       try {
-        await driver.setContext('content');
-        if (originalContextId) {
+        if (originalContextId && originalContextId !== chromeContextId) {
+          await driver.setContext('content');
           await driver.switchTo().window(originalContextId);
         }
       } catch {
@@ -222,10 +222,10 @@ export async function handleGetFirefoxPrefs(args: unknown): Promise<McpToolRespo
 
       return successResponse(output.join('\n'));
     } finally {
-      // Restore content context
+      // Restore previous context (skip if already on the right chrome context)
       try {
-        await driver.setContext('content');
-        if (originalContextId) {
+        if (originalContextId && originalContextId !== chromeContextId) {
+          await driver.setContext('content');
           await driver.switchTo().window(originalContextId);
         }
       } catch {
diff --git a/src/tools/privileged-context.ts b/src/tools/privileged-context.ts
index e68b5c3..7f0c74d 100644
--- a/src/tools/privileged-context.ts
+++ b/src/tools/privileged-context.ts
@@ -111,6 +111,10 @@ export async function handleSelectPrivilegedContext(args: unknown): Promise<McpT
       );
     }
 
+    // Update tracked context so helper tools (set_firefox_prefs, list_extensions)
+    // restore to this context instead of the old content context.
+    firefox.setCurrentContextId(contextId);
+
     return successResponse(
       `✅ Switched to privileged context: ${contextId} (Marionette context set to privileged)`
     );
diff --git a/src/tools/webextension.ts b/src/tools/webextension.ts
index 168ee0d..90ec18e 100644
--- a/src/tools/webextension.ts
+++ b/src/tools/webextension.ts
@@ -321,10 +321,10 @@ export async function handleListExtensions(args: unknown): Promise<McpToolRespon
 
       return successResponse(formatExtensionList(extensions, filterDesc || undefined));
     } finally {
-      // Restore content context
+      // Restore previous context (skip if already on the right chrome context)
       try {
-        await driver.setContext('content');
-        if (originalContextId) {
+        if (originalContextId && originalContextId !== chromeContextId) {
+          await driver.setContext('content');
           await driver.switchTo().window(originalContextId);
         }
       } catch {
diff --git a/tests/tools/privileged-context.test.ts b/tests/tools/privileged-context.test.ts
new file mode 100644
index 0000000..f9af4b6
--- /dev/null
+++ b/tests/tools/privileged-context.test.ts
@@ -0,0 +1,94 @@
+/**
+ * Tests for privileged context state consistency
+ *
+ * Verifies that select_privileged_context updates currentContextId,
+ * and that helper tools (set_firefox_prefs, list_extensions) don't
+ * silently break a user's privileged context selection.
+ */
+
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+describe('Privileged context state consistency', () => {
+  const mockSetContext = vi.fn();
+  const mockSwitchToWindow = vi.fn();
+  const mockExecuteScript = vi.fn();
+  const mockExecuteAsyncScript = vi.fn();
+
+  // Track currentContextId state as the real code would
+  let mockCurrentContextId: string | null;
+  const mockSetCurrentContextId = vi.fn((id: string) => {
+    mockCurrentContextId = id;
+  });
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.resetModules();
+    // Start with a content context (user has a normal tab open)
+    mockCurrentContextId = 'original-content-context';
+
+    vi.doMock('../../src/index.js', () => ({
+      getFirefox: vi.fn().mockResolvedValue({
+        getDriver: () => ({
+          switchTo: () => ({
+            window: mockSwitchToWindow,
+          }),
+          setContext: mockSetContext,
+          executeScript: mockExecuteScript,
+          executeAsyncScript: mockExecuteAsyncScript,
+        }),
+        getCurrentContextId: () => mockCurrentContextId,
+        setCurrentContextId: mockSetCurrentContextId,
+        sendBiDiCommand: vi.fn().mockResolvedValue({
+          contexts: [{ context: 'chrome-context-id', url: 'chrome://browser/content/browser.xhtml' }],
+        }),
+      }),
+    }));
+  });
+
+  it('select_privileged_context should update currentContextId (BUG: it does not)', async () => {
+    const { handleSelectPrivilegedContext } = await import(
+      '../../src/tools/privileged-context.js'
+    );
+
+    await handleSelectPrivilegedContext({ contextId: 'chrome-context-id' });
+
+    expect(mockSwitchToWindow).toHaveBeenCalledWith('chrome-context-id');
+    expect(mockSetContext).toHaveBeenCalledWith('chrome');
+
+    // BUG: select_privileged_context does NOT call setCurrentContextId
+    // so currentContextId stays as 'original-content-context'
+    expect(mockSetCurrentContextId).toHaveBeenCalledWith('chrome-context-id');
+  });
+
+  it('set_firefox_prefs after select_privileged_context should not revert to old context (BUG: it does)', async () => {
+    const { handleSelectPrivilegedContext } = await import(
+      '../../src/tools/privileged-context.js'
+    );
+    const { handleSetFirefoxPrefs } = await import(
+      '../../src/tools/firefox-prefs.js'
+    );
+
+    // User selects privileged context
+    await handleSelectPrivilegedContext({ contextId: 'chrome-context-id' });
+
+    // BUG: currentContextId is still 'original-content-context' because
+    // select_privileged_context never called setCurrentContextId.
+    // So when set_firefox_prefs saves originalContextId, it gets the wrong value.
+    mockExecuteScript.mockResolvedValue(undefined);
+    mockSwitchToWindow.mockClear();
+    mockSetContext.mockClear();
+
+    await handleSetFirefoxPrefs({ prefs: { 'browser.ml.enable': true } });
+
+    // The finally block in set_firefox_prefs restores to originalContextId.
+    // Because currentContextId was never updated, it restores to
+    // 'original-content-context' — silently undoing the privileged context selection.
+    const setContextCalls = mockSetContext.mock.calls;
+    const lastSetContext = setContextCalls[setContextCalls.length - 1];
+
+    // BUG: last setContext call is 'content' — it reverted the privileged context
+    // After fix: the tool should detect we're already in a privileged context
+    // and restore back to it (or at minimum, currentContextId should be correct)
+    expect(lastSetContext[0]).not.toBe('content');
+  });
+});