diff --git a/playwright.config.ts b/playwright.config.ts
index 834b8e6..7298da8 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -30,6 +30,7 @@ if (isCI || includeWebKit) {
 
 export default defineConfig({
   testDir: 'playwright',
+  fullyParallel: isCI,
   timeout: isCI ? 120_000 : 20_000,
   retries: isCI ? 1 : 0,
   workers: isCI ? 1 : undefined,
diff --git a/playwright/github-byot-ai.spec.ts b/playwright/github-byot-ai.spec.ts
index ca9e24a..c473920 100644
--- a/playwright/github-byot-ai.spec.ts
+++ b/playwright/github-byot-ai.spec.ts
@@ -23,6 +23,11 @@ test('PR/BYOT controls are visible and chat stays hidden until token connect', a
     exact: true,
     includeHidden: true,
   })
+  const workspacesToggle = page.getByRole('button', {
+    name: 'Workspaces',
+    exact: true,
+    includeHidden: true,
+  })
   await expect(byotControls).toBeVisible()
   await expect(page.getByRole('textbox', { name: 'GitHub token' })).toBeVisible()
   await expect(page.getByRole('button', { name: 'Add GitHub token' })).toBeVisible()
@@ -30,6 +35,8 @@ test('PR/BYOT controls are visible and chat stays hidden until token connect', a
   await expect(page.getByRole('heading', { name: 'AI Chat' })).toBeHidden()
   await expect(prToggle).toHaveCount(1)
   await expect(prToggle).toBeHidden()
+  await expect(workspacesToggle).toHaveCount(1)
+  await expect(workspacesToggle).toBeHidden()
 })
 
 test('chat becomes available after token connect', async ({ page }) => {
@@ -37,6 +44,7 @@ test('chat becomes available after token connect', async ({ page }) => {
   await connectByotWithSingleRepo(page)
 
   await expect(page.getByRole('button', { name: 'Open pull request' })).toBeVisible()
+  await expect(page.getByRole('button', { name: 'Workspaces' })).toBeVisible()
   await expect(page.getByRole('button', { name: 'Chat' })).toBeVisible()
 })
 
@@ -49,12 +57,19 @@ test('BYOT controls render with default app entry', async ({ page }) => {
     exact: true,
     includeHidden: true,
   })
+  const workspacesToggle = page.getByRole('button', {
+    name: 'Workspaces',
+    exact: true,
+    includeHidden: true,
+  })
   await expect(byotControls).toBeVisible()
   await expect(page.getByRole('textbox', { name: 'GitHub token' })).toBeVisible()
   await expect(page.getByRole('button', { name: 'Add GitHub token' })).toBeVisible()
   await expect(page.getByRole('button', { name: 'Chat' })).toBeHidden()
   await expect(prToggle).toHaveCount(1)
   await expect(prToggle).toBeHidden()
+  await expect(workspacesToggle).toHaveCount(1)
+  await expect(workspacesToggle).toBeHidden()
 })
 
 test('GitHub token info panel reflects missing and present token states', async ({
diff --git a/playwright/helpers/app-test-helpers.ts b/playwright/helpers/app-test-helpers.ts
index 9224765..c8763a5 100644
--- a/playwright/helpers/app-test-helpers.ts
+++ b/playwright/helpers/app-test-helpers.ts
@@ -171,6 +171,22 @@ export const openWorkspaceTab = async (page: Page, fileName: string) => {
   await page.getByRole('button', { name: pattern }).click()
 }
 
+const replaceEditorSource = async ({
+  editorContent,
+  source,
+}: {
+  editorContent: ReturnType<Page['locator']>
+  source: string
+}) => {
+  for (let attempt = 0; attempt < 2; attempt += 1) {
+    await editorContent.fill('')
+    await editorContent.fill(source)
+    await editorContent.press('End')
+    await editorContent.type(' ')
+    await editorContent.press('Backspace')
+  }
+}
+
 export const reorderWorkspaceTabBefore = async (
   page: Page,
   { from, to }: { from: string; to: string },
@@ -199,35 +215,29 @@ export const setWorkspaceTabSource = async (
   },
 ) => {
   await openWorkspaceTab(page, fileName)
+  await expect(page.getByRole('region', { name: fileName })).toBeVisible()
   const editorContent = page
     .locator(`.editor-panel[data-editor-kind="${kind}"] .cm-content`)
     .first()
-  await editorContent.fill(source)
-  await editorContent.press('End')
-  await editorContent.type(' ')
-  await editorContent.press('Backspace')
+  await replaceEditorSource({ editorContent, source })
 }
 
 export const setComponentEditorSource = async (page: Page, source: string) => {
   await page.getByRole('button', { name: 'Open tab App.tsx' }).click()
+  await expect(page.getByRole('region', { name: 'App.tsx' })).toBeVisible()
   const editorContent = page
     .locator('.editor-panel[data-editor-kind="component"] .cm-content')
     .first()
-  await editorContent.fill(source)
-  await editorContent.press('End')
-  await editorContent.type(' ')
-  await editorContent.press('Backspace')
+  await replaceEditorSource({ editorContent, source })
 }
 
 export const setStylesEditorSource = async (page: Page, source: string) => {
   await page.getByRole('button', { name: 'Open tab app.css' }).click()
+  await expect(page.getByRole('region', { name: 'app.css' })).toBeVisible()
   const editorContent = page
     .locator('.editor-panel[data-editor-kind="styles"] .cm-content')
     .first()
-  await editorContent.fill(source)
-  await editorContent.press('End')
-  await editorContent.type(' ')
-  await editorContent.press('Backspace')
+  await replaceEditorSource({ editorContent, source })
 }
 
 export const getActiveComponentEditorLineNumber = async (page: Page) => {
diff --git a/playwright/rendering-modes.spec.ts b/playwright/rendering-modes.spec.ts
index 2335e4d..b51aa85 100644
--- a/playwright/rendering-modes.spec.ts
+++ b/playwright/rendering-modes.spec.ts
@@ -577,7 +577,7 @@ test('shows App-only error when auto render is disabled and App is missing', asy
   )
 })
 
-test('auto render implicitly wraps source with App in dom and react modes', async ({
+test('auto render shows App-only error in dom and react modes when App is missing', async ({
   page,
 }) => {
   await waitForInitialRender(page)
@@ -589,9 +589,9 @@ test('auto render implicitly wraps source with App in dom and react modes', asyn
     'const Button = () => <button type="button">implicit app dom</button>',
   )
 
-  await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Rendered')
-  await expect(getPreviewFrame(page).getByRole('button')).toContainText(
-    'implicit app dom',
+  await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Error')
+  await expect(page.locator('#preview-host pre')).toContainText(
+    'Expected a function or const named App.',
   )
 
   await page.getByRole('combobox', { name: 'Render mode' }).selectOption('react')
@@ -604,13 +604,13 @@ test('auto render implicitly wraps source with App in dom and react modes', asyn
     page.locator('.editor-panel[data-editor-kind="component"] .cm-content').first(),
   ).toContainText('implicit app react')
 
-  await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Rendered')
-  await expect(getPreviewFrame(page).getByRole('button')).toContainText(
-    'implicit app react',
+  await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Error')
+  await expect(page.locator('#preview-host pre')).toContainText(
+    'Expected a function or const named App.',
   )
 })
 
-test('auto render implicit App includes multiple component declarations', async ({
+test('auto render renders successfully when explicit App is defined in dom and react modes', async ({
   page,
 }) => {
   await waitForInitialRender(page)
@@ -619,15 +619,25 @@ test('auto render implicit App includes multiple component declarations', async
 
   await setComponentEditorSource(
     page,
-    [
-      'const OtherButton = () => <button type="button">bar</button>',
-      'const Button = () => <button type="button">foo</button>',
-    ].join('\n'),
+    'const App = () => <button type="button">explicit app dom</button>',
   )
 
   await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Rendered')
-  await expect(getPreviewFrame(page).getByRole('button')).toHaveCount(2)
-  await expect(getPreviewFrame(page).getByRole('button')).toContainText(['bar', 'foo'])
+  await expect(getPreviewFrame(page).getByRole('button')).toContainText(
+    'explicit app dom',
+  )
+
+  await page.getByRole('combobox', { name: 'Render mode' }).selectOption('react')
+  await expect(page.getByRole('combobox', { name: 'Render mode' })).toHaveValue('react')
+  await setComponentEditorSource(
+    page,
+    'const App = () => <button type="button">explicit app react</button>',
+  )
+
+  await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Rendered')
+  await expect(getPreviewFrame(page).getByRole('button')).toContainText(
+    'explicit app react',
+  )
 })
 
 test('auto render does not treat lowercase helpers as implicit components', async ({
@@ -651,7 +661,7 @@ test('auto render does not treat lowercase helpers as implicit components', asyn
   )
 })
 
-test('auto render wraps standalone JSX with trailing semicolon and comment', async ({
+test('auto render shows App-only error for standalone JSX expression', async ({
   page,
 }) => {
   await waitForInitialRender(page)
@@ -663,13 +673,13 @@ test('auto render wraps standalone JSX with trailing semicolon and comment', asy
     '(<button type="button">implicit app from jsx expression</button>) as any; // trailing',
   )
 
-  await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Rendered')
-  await expect(getPreviewFrame(page).getByRole('button')).toContainText(
-    'implicit app from jsx expression',
+  await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Error')
+  await expect(page.locator('#preview-host pre')).toContainText(
+    'Expected a function or const named App.',
   )
 })
 
-test('auto render requires explicit App for declarations plus top-level JSX expression', async ({
+test('auto render shows App-only error for declarations plus top-level JSX expression', async ({
   page,
 }) => {
   await waitForInitialRender(page)
@@ -687,7 +697,7 @@ test('auto render requires explicit App for declarations plus top-level JSX expr
 
   await expect(page.getByRole('status', { name: 'App status' })).toHaveText('Error')
   await expect(page.locator('#preview-host pre')).toContainText(
-    'Top-level JSX with declarations or imports requires an explicit App component.',
+    'Expected a function or const named App.',
   )
 })
 
diff --git a/src/index.html b/src/index.html
index d625d9a..f3c62eb 100644
--- a/src/index.html
+++ b/src/index.html
@@ -165,6 +165,7 @@ <h1>
             aria-controls="workspaces-drawer"
             title="Manage local workspaces"
             disabled
+            hidden
           >
             <svg class="workspaces-toggle__icon" viewBox="0 0 24 24" aria-hidden="true">
               <path
diff --git a/src/modules/app-core/app-composition-options.js b/src/modules/app-core/app-composition-options.js
index 3c8a9cd..4ffa2e4 100644
--- a/src/modules/app-core/app-composition-options.js
+++ b/src/modules/app-core/app-composition-options.js
@@ -91,7 +91,6 @@ const createRuntimeCoreOptions = ({
     cdnImports,
     importFromCdnWithFallback,
     renderMode,
-    isAutoRenderEnabled: () => autoRenderToggle.checked,
     getJsxSource,
     getWorkspaceTabs: () => buildWorkspaceTabsSnapshot(),
     getPreviewHost,
diff --git a/src/modules/app-core/github-pr-context-ui.js b/src/modules/app-core/github-pr-context-ui.js
index ec93b62..6ee2c87 100644
--- a/src/modules/app-core/github-pr-context-ui.js
+++ b/src/modules/app-core/github-pr-context-ui.js
@@ -111,17 +111,25 @@ export const createGitHubPrContextUiController = ({
         workspacesToggle.disabled = false
       }
 
-      aiChatToggle?.removeAttribute('hidden')
+      if (aiChatToggle instanceof HTMLElement) {
+        aiChatToggle.hidden = false
+      }
 
-      githubPrToggle?.removeAttribute('hidden')
+      if (githubPrToggle instanceof HTMLElement) {
+        githubPrToggle.hidden = false
+      }
       if (!contextState.activePrContext) {
-        workspacesToggle?.removeAttribute('hidden')
+        if (workspacesToggle instanceof HTMLElement) {
+          workspacesToggle.hidden = false
+        }
       }
 
       if (contextState.activePrContext) {
         githubPrContextClose?.removeAttribute('hidden')
         githubPrContextDisconnect?.removeAttribute('hidden')
-        workspacesToggle?.setAttribute('hidden', '')
+        if (workspacesToggle instanceof HTMLElement) {
+          workspacesToggle.hidden = true
+        }
       } else {
         githubPrContextClose?.setAttribute('hidden', '')
         githubPrContextDisconnect?.setAttribute('hidden', '')
@@ -129,7 +137,9 @@ export const createGitHubPrContextUiController = ({
       return
     }
 
-    aiChatToggle?.setAttribute('hidden', '')
+    if (aiChatToggle instanceof HTMLElement) {
+      aiChatToggle.hidden = true
+    }
     aiChatToggle?.setAttribute('aria-expanded', 'false')
     if (workspacesToggle instanceof HTMLButtonElement) {
       workspacesToggle.disabled = true
@@ -139,9 +149,13 @@ export const createGitHubPrContextUiController = ({
     contextState.hasSyncedActivePrEditorContent = false
     syncEditorPrContextIndicators(false)
     setGitHubPrToggleVisual('open-pr')
-    githubPrToggle?.setAttribute('hidden', '')
+    if (githubPrToggle instanceof HTMLElement) {
+      githubPrToggle.hidden = true
+    }
     githubPrToggle?.setAttribute('aria-expanded', 'false')
-    workspacesToggle?.setAttribute('hidden', '')
+    if (workspacesToggle instanceof HTMLElement) {
+      workspacesToggle.hidden = true
+    }
     workspacesToggle?.setAttribute('aria-expanded', 'false')
     githubPrContextClose?.setAttribute('hidden', '')
     githubPrContextDisconnect?.setAttribute('hidden', '')
diff --git a/src/modules/app-core/github-workflows.js b/src/modules/app-core/github-workflows.js
index 69fdd09..7966386 100644
--- a/src/modules/app-core/github-workflows.js
+++ b/src/modules/app-core/github-workflows.js
@@ -187,9 +187,6 @@ const initializeGitHubWorkflows = ({
     onActivePrContextChange: activeContext => {
       prContextUi.setActivePrContext(activeContext)
       prContextUi.syncAiChatTokenVisibility(getTokenForVisibility())
-      if (workspacesToggle instanceof HTMLButtonElement) {
-        workspacesToggle.hidden = Boolean(activeContext)
-      }
 
       if (activeContext) {
         closeWorkspacesDrawer()
diff --git a/src/modules/app-core/workspace-controllers-setup.js b/src/modules/app-core/workspace-controllers-setup.js
index ec09b78..ed4919d 100644
--- a/src/modules/app-core/workspace-controllers-setup.js
+++ b/src/modules/app-core/workspace-controllers-setup.js
@@ -111,9 +111,6 @@ const createWorkspaceControllersSetup = ({
   const setActiveWorkspaceTab = tabId =>
     workspaceTabSelectionController.setActiveWorkspaceTab(tabId)
 
-  const syncEditorFromActiveWorkspaceTabDelegate = () =>
-    workspaceTabSelectionController.syncEditorFromActiveWorkspaceTab()
-
   workspaceTabMutationsController = createWorkspaceTabMutationsController({
     toNonEmptyWorkspaceText,
     workspaceTabsState,
@@ -186,7 +183,6 @@ const createWorkspaceControllersSetup = ({
     getShouldShowEditedDesign,
     workspaceTabsShell,
     workspaceTabAddWrap,
-    syncEditorFromActiveWorkspaceTab: syncEditorFromActiveWorkspaceTabDelegate,
   })
 
   const workspaceContextController = createWorkspaceContextController({
diff --git a/src/modules/app-core/workspace-tab-selection-controller.js b/src/modules/app-core/workspace-tab-selection-controller.js
index 1a7bcbf..a63c5d3 100644
--- a/src/modules/app-core/workspace-tab-selection-controller.js
+++ b/src/modules/app-core/workspace-tab-selection-controller.js
@@ -47,18 +47,8 @@ const createWorkspaceTabSelectionController = ({
     })
   }
 
-  const syncEditorFromActiveWorkspaceTab = () => {
-    const activeTab = getActiveWorkspaceTab()
-    if (!activeTab) {
-      return
-    }
-
-    loadWorkspaceTabIntoEditor(activeTab)
-  }
-
   return {
     setActiveWorkspaceTab,
-    syncEditorFromActiveWorkspaceTab,
   }
 }
 
diff --git a/src/modules/app-core/workspace-tabs-renderer.js b/src/modules/app-core/workspace-tabs-renderer.js
index a47369f..09c6937 100644
--- a/src/modules/app-core/workspace-tabs-renderer.js
+++ b/src/modules/app-core/workspace-tabs-renderer.js
@@ -22,7 +22,6 @@ const createWorkspaceTabsRenderer = ({
   getShouldShowEditedDesign,
   workspaceTabsShell,
   workspaceTabAddWrap,
-  syncEditorFromActiveWorkspaceTab,
 }) => {
   const clearWorkspaceTabDragState = () => {
     setDraggedWorkspaceTabId('')
@@ -294,8 +293,6 @@ const createWorkspaceTabsRenderer = ({
       renderWorkspaceTabs()
       return
     }
-
-    syncEditorFromActiveWorkspaceTab()
   }
 
   return {
diff --git a/src/modules/preview/render-runtime.js b/src/modules/preview/render-runtime.js
index 33dfcd3..77d406f 100644
--- a/src/modules/preview/render-runtime.js
+++ b/src/modules/preview/render-runtime.js
@@ -1,8 +1,3 @@
-import {
-  collectTopLevelTransformMetadata,
-  getFunctionLikeDeclarationNames,
-  hasFunctionLikeDeclarationNamed,
-} from './jsx-top-level-declarations.js'
 import { canRenderPreview, resolvePreviewEntryTab } from './preview-entry-resolver.js'
 import { createWorkspaceIframePreviewBridge } from '../preview-runtime/iframe-preview-executor.js'
 import { planWorkspaceVirtualModules } from '../preview-runtime/virtual-workspace-modules.js'
@@ -14,7 +9,6 @@ export const createRenderRuntimeController = ({
   cdnImports,
   importFromCdnWithFallback,
   renderMode,
-  isAutoRenderEnabled = () => false,
   getJsxSource,
   getWorkspaceTabs,
   getPreviewHost,
@@ -47,11 +41,6 @@ export const createRenderRuntimeController = ({
   let iframeRuntimeBridge = null
   let lastRenderedEntryTabId = ''
   let lastRenderedDependencyTabIds = new Set()
-  let topLevelTransformMetadataCache = {
-    source: null,
-    transformJsxSource: null,
-    value: null,
-  }
   let hasCompletedInitialRender = false
   const workspaceGraphCache = createPreviewWorkspaceGraphCache()
   const styleTabLanguages = new Set(['css', 'less', 'sass', 'module'])
@@ -277,104 +266,6 @@ export const createRenderRuntimeController = ({
     return lines.join('\n')
   }
 
-  const hasAppDeclaration = declarations =>
-    hasFunctionLikeDeclarationNamed({ declarations, name: 'App' })
-
-  const isComponentLikeName = name => typeof name === 'string' && /^[A-Z]/.test(name)
-
-  const getComponentNames = declarations =>
-    getFunctionLikeDeclarationNames({ declarations, excludeNames: ['App'] }).filter(
-      isComponentLikeName,
-    )
-
-  const isSourceRange = range =>
-    Array.isArray(range) &&
-    range.length === 2 &&
-    Number.isInteger(range[0]) &&
-    Number.isInteger(range[1])
-
-  const sourceFromRange = ({ source, range }) => {
-    if (!isSourceRange(range)) {
-      return null
-    }
-
-    const [start, end] = range
-    if (start < 0 || end < start || end > source.length) {
-      return null
-    }
-
-    const expression = source.slice(start, end).trim()
-    return expression || null
-  }
-
-  const getTopLevelTransformMetadata = ({ source, transformJsxSource }) => {
-    if (
-      topLevelTransformMetadataCache.source === source &&
-      topLevelTransformMetadataCache.transformJsxSource === transformJsxSource &&
-      topLevelTransformMetadataCache.value
-    ) {
-      return topLevelTransformMetadataCache.value
-    }
-
-    const value = collectTopLevelTransformMetadata({ source, transformJsxSource })
-    topLevelTransformMetadataCache = {
-      source,
-      transformJsxSource,
-      value,
-    }
-
-    return value
-  }
-
-  const withImplicitAppWrapper = (source, transformJsxSource) => {
-    if (!source.trim()) {
-      return source
-    }
-
-    if (/^\s*export\s+default\b/m.test(source)) {
-      return source
-    }
-
-    const {
-      declarations,
-      importCount,
-      hasTopLevelJsxExpression,
-      topLevelJsxExpressionRange,
-    } = getTopLevelTransformMetadata({ source, transformJsxSource })
-    if (hasAppDeclaration(declarations)) {
-      return source
-    }
-
-    if (hasTopLevelJsxExpression) {
-      const expressionSource = sourceFromRange({
-        source,
-        range: topLevelJsxExpressionRange,
-      })
-
-      if (!expressionSource) {
-        throw new Error(
-          'Unable to infer top-level JSX entry for implicit App. Define App explicitly.',
-        )
-      }
-
-      if (declarations.length > 0 || importCount > 0) {
-        throw new Error(
-          'Top-level JSX with declarations or imports requires an explicit App component.',
-        )
-      }
-
-      return `const App = () => (${expressionSource})`
-    }
-
-    const componentNames = getComponentNames(declarations)
-    if (componentNames.length > 0) {
-      const children = componentNames.map(name => `    <${name} />`).join('\n')
-      return `${source}\n\nconst App = () => (\n  <>\n${children}\n  </>\n)`
-    }
-
-    return source
-  }
-
   const isSassCompiler = candidate =>
     Boolean(
       candidate &&
@@ -765,28 +656,6 @@ export const createRenderRuntimeController = ({
     reactDomClient: getRuntimeSpecifier('reactDomClient'),
   })
 
-  const withPreparedEntrySource = ({ tabs, entryTab, transformJsxSource }) => {
-    if (!isAutoRenderEnabled()) {
-      return tabs
-    }
-
-    const entrySource = typeof entryTab?.content === 'string' ? entryTab.content : ''
-    const wrappedEntrySource = withImplicitAppWrapper(entrySource, transformJsxSource)
-
-    if (wrappedEntrySource === entrySource) {
-      return tabs
-    }
-
-    return tabs.map(tab =>
-      tab?.id === entryTab.id
-        ? {
-            ...tab,
-            content: wrappedEntrySource,
-          }
-        : tab,
-    )
-  }
-
   const renderWorkspaceInIframe = async ({ mode, cssText }) => {
     const workspaceTabs = getWorkspaceTabsForPreview()
     const entryTab = resolveWorkspaceEntryTab(workspaceTabs)
@@ -796,11 +665,7 @@ export const createRenderRuntimeController = ({
     }
 
     const { transformJsxSource } = await ensureCoreRuntime()
-    const tabsForExecution = withPreparedEntrySource({
-      tabs: workspaceTabs,
-      entryTab,
-      transformJsxSource,
-    })
+    const tabsForExecution = workspaceTabs
     const entryTabForExecution =
       resolvePreviewEntryTab(tabsForExecution) ??
       tabsForExecution.find(tab => tab?.id === entryTab.id) ??
diff --git a/src/styles/ai-controls.css b/src/styles/ai-controls.css
index e5271a2..503bfc7 100644
--- a/src/styles/ai-controls.css
+++ b/src/styles/ai-controls.css
@@ -22,11 +22,11 @@
 }
 
 .app-grid-ai-controls[hidden] {
-  display: none !important;
+  display: none;
 }
 
 .app-grid-ai-controls .layout-toggle[hidden] {
-  display: none !important;
+  display: none;
 }
 
 .github-token-control-wrap {
@@ -178,7 +178,7 @@
 }
 
 .github-token-info-panel[hidden] {
-  display: none !important;
+  display: none;
 }
 
 .github-token-info-message {
@@ -427,7 +427,7 @@
 }
 
 .github-pr-context-close[hidden] {
-  display: none !important;
+  display: none;
 }
 
 .diagnostics-toggle.github-pr-context-disconnect {
@@ -482,15 +482,7 @@
 }
 
 .github-pr-context-disconnect[hidden] {
-  display: none !important;
-}
-
-.github-pr-toggle[hidden] {
-  display: none !important;
-}
-
-.ai-chat-toggle[hidden] {
-  display: none !important;
+  display: none;
 }
 
 .ai-chat-drawer {
@@ -524,7 +516,7 @@
 }
 
 .ai-chat-drawer[hidden] {
-  display: none !important;
+  display: none;
 }
 
 .github-pr-drawer {
@@ -558,7 +550,7 @@
 }
 
 .github-pr-drawer[hidden] {
-  display: none !important;
+  display: none;
 }
 
 .workspaces-drawer {
@@ -592,7 +584,7 @@
 }
 
 .workspaces-drawer[hidden] {
-  display: none !important;
+  display: none;
 }
 
 .workspaces-drawer__header {
@@ -707,7 +699,7 @@
 }
 
 .github-pr-field[hidden] {
-  display: none !important;
+  display: none;
 }
 
 .github-pr-field--checkbox {
diff --git a/src/styles/diagnostics.css b/src/styles/diagnostics.css
index 9bfb21f..36ce040 100644
--- a/src/styles/diagnostics.css
+++ b/src/styles/diagnostics.css
@@ -91,6 +91,10 @@
   cursor: pointer;
 }
 
+.diagnostics-toggle[hidden] {
+  display: none;
+}
+
 .diagnostics-toggle:hover {
   background: var(--surface-control-hover);
 }