diff --git a/browser_tests/fixtures/components/SettingDialog.ts b/browser_tests/fixtures/components/SettingDialog.ts
index 24e64db974..d3e791bf40 100644
--- a/browser_tests/fixtures/components/SettingDialog.ts
+++ b/browser_tests/fixtures/components/SettingDialog.ts
@@ -36,9 +36,21 @@ export class SettingDialog extends BaseDialog {
     await settingInputDiv.locator('input').click()
   }
 
+  get searchBox() {
+    return this.root.getByPlaceholder(/Search/)
+  }
+
+  get categories() {
+    return this.root.locator('nav').getByRole('button')
+  }
+
+  get contentArea() {
+    return this.root.getByRole('main')
+  }
+
   async goToAboutPanel() {
-    const aboutButton = this.root.locator('nav [role="button"]', {
-      hasText: 'About'
+    const aboutButton = this.root.locator('nav').getByRole('button', {
+      name: 'About'
     })
     await aboutButton.click()
     await this.page.waitForSelector('.about-container')
diff --git a/browser_tests/tests/useSettingSearch.spec.ts b/browser_tests/tests/useSettingSearch.spec.ts
index 5b6e35e8af..d71807025f 100644
--- a/browser_tests/tests/useSettingSearch.spec.ts
+++ b/browser_tests/tests/useSettingSearch.spec.ts
@@ -2,7 +2,6 @@ import { expect } from '@playwright/test'
 
 import type { Settings } from '../../src/schemas/apiSchema'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
-import { TestIds } from '../fixtures/selectors'
 
 /**
  * Type helper for test settings with arbitrary IDs.
@@ -50,188 +49,143 @@ test.describe('Settings Search functionality', { tag: '@settings' }, () => {
   })
 
   test('can open settings dialog and use search box', async ({ comfyPage }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const searchBox = settingsDialog.locator('input[placeholder*="Search"]')
-    await expect(searchBox).toBeVisible()
-
-    await expect(searchBox).toHaveAttribute(
+    await expect(dialog.searchBox).toHaveAttribute(
       'placeholder',
       expect.stringContaining('Search')
     )
   })
 
   test('search box is functional and accepts input', async ({ comfyPage }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const searchBox = settingsDialog.locator('input[placeholder*="Search"]')
-    await searchBox.fill('Comfy')
-
-    await expect(searchBox).toHaveValue('Comfy')
+    await dialog.searchBox.fill('Comfy')
+    await expect(dialog.searchBox).toHaveValue('Comfy')
   })
 
   test('search box clears properly', async ({ comfyPage }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const searchBox = settingsDialog.locator('input[placeholder*="Search"]')
-    await searchBox.fill('test')
-    await expect(searchBox).toHaveValue('test')
+    await dialog.searchBox.fill('test')
+    await expect(dialog.searchBox).toHaveValue('test')
 
-    await searchBox.clear()
-    await expect(searchBox).toHaveValue('')
+    await dialog.searchBox.clear()
+    await expect(dialog.searchBox).toHaveValue('')
   })
 
   test('settings categories are visible in sidebar', async ({ comfyPage }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const categories = settingsDialog.locator('nav [role="button"]')
-    expect(await categories.count()).toBeGreaterThan(0)
-
-    await expect(categories.first()).toBeVisible()
+    expect(await dialog.categories.count()).toBeGreaterThan(0)
   })
 
   test('can select different categories in sidebar', async ({ comfyPage }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const categories = settingsDialog.locator('nav [role="button"]')
-    const categoryCount = await categories.count()
+    const categoryCount = await dialog.categories.count()
 
     if (categoryCount > 1) {
-      await categories.nth(1).click()
+      await dialog.categories.nth(1).click()
 
-      await expect(categories.nth(1)).toHaveClass(
+      await expect(dialog.categories.nth(1)).toHaveClass(
         /bg-interface-menu-component-surface-selected/
       )
     }
   })
 
-  test('settings content area is visible', async ({ comfyPage }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
-
-    const contentArea = settingsDialog.locator('main')
-    await expect(contentArea).toBeVisible()
-  })
-
   test('search functionality affects UI state', async ({ comfyPage }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const searchBox = settingsDialog.locator('input[placeholder*="Search"]')
-    await searchBox.fill('graph')
-
-    await expect(searchBox).toHaveValue('graph')
+    await dialog.searchBox.fill('graph')
+    await expect(dialog.searchBox).toHaveValue('graph')
   })
 
   test('settings dialog can be closed', async ({ comfyPage }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
     await comfyPage.page.keyboard.press('Escape')
-
-    await expect(settingsDialog).not.toBeVisible()
+    await expect(dialog.root).not.toBeVisible()
   })
 
   test('search box has proper debouncing behavior', async ({ comfyPage }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const searchBox = settingsDialog.locator('input[placeholder*="Search"]')
-    await searchBox.fill('a')
-    await searchBox.fill('ab')
-    await searchBox.fill('abc')
-    await searchBox.fill('abcd')
+    await dialog.searchBox.fill('a')
+    await dialog.searchBox.fill('ab')
+    await dialog.searchBox.fill('abc')
+    await dialog.searchBox.fill('abcd')
 
-    await expect(searchBox).toHaveValue('abcd')
+    await expect(dialog.searchBox).toHaveValue('abcd')
   })
 
   test('search excludes hidden settings from results', async ({
     comfyPage
   }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const searchBox = settingsDialog.locator('input[placeholder*="Search"]')
-    await searchBox.fill('Test')
+    await dialog.searchBox.fill('Test')
 
-    const contentArea = settingsDialog.locator('main')
-
-    await expect(contentArea).toContainText('Test Visible Setting')
-    await expect(contentArea).not.toContainText('Test Hidden Setting')
+    await expect(dialog.contentArea).toContainText('Test Visible Setting')
+    await expect(dialog.contentArea).not.toContainText('Test Hidden Setting')
   })
 
   test('search excludes deprecated settings from results', async ({
     comfyPage
   }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const searchBox = settingsDialog.locator('input[placeholder*="Search"]')
-    await searchBox.fill('Test')
+    await dialog.searchBox.fill('Test')
 
-    const contentArea = settingsDialog.locator('main')
-
-    await expect(contentArea).toContainText('Test Visible Setting')
-    await expect(contentArea).not.toContainText('Test Deprecated Setting')
+    await expect(dialog.contentArea).toContainText('Test Visible Setting')
+    await expect(dialog.contentArea).not.toContainText(
+      'Test Deprecated Setting'
+    )
   })
 
   test('search shows visible settings but excludes hidden and deprecated', async ({
     comfyPage
   }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const searchBox = settingsDialog.locator('input[placeholder*="Search"]')
-    await searchBox.fill('Test')
+    await dialog.searchBox.fill('Test')
 
-    const contentArea = settingsDialog.locator('main')
-
-    await expect(contentArea).toContainText('Test Visible Setting')
-
-    await expect(contentArea).not.toContainText('Test Hidden Setting')
-    await expect(contentArea).not.toContainText('Test Deprecated Setting')
+    await expect(dialog.contentArea).toContainText('Test Visible Setting')
+    await expect(dialog.contentArea).not.toContainText('Test Hidden Setting')
+    await expect(dialog.contentArea).not.toContainText(
+      'Test Deprecated Setting'
+    )
   })
 
   test('search by setting name excludes hidden and deprecated', async ({
     comfyPage
   }) => {
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.getByTestId(TestIds.dialogs.settings)
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const searchBox = settingsDialog.locator('input[placeholder*="Search"]')
-    const contentArea = settingsDialog.locator('main')
+    await dialog.searchBox.clear()
+    await dialog.searchBox.fill('Hidden')
+    await expect(dialog.contentArea).not.toContainText('Test Hidden Setting')
 
-    await searchBox.clear()
-    await searchBox.fill('Hidden')
+    await dialog.searchBox.clear()
+    await dialog.searchBox.fill('Deprecated')
+    await expect(dialog.contentArea).not.toContainText(
+      'Test Deprecated Setting'
+    )
 
-    await expect(contentArea).not.toContainText('Test Hidden Setting')
-
-    await searchBox.clear()
-    await searchBox.fill('Deprecated')
-
-    await expect(contentArea).not.toContainText('Test Deprecated Setting')
-
-    await searchBox.clear()
-    await searchBox.fill('Visible')
-
-    await expect(contentArea).toContainText('Test Visible Setting')
+    await dialog.searchBox.clear()
+    await dialog.searchBox.fill('Visible')
+    await expect(dialog.contentArea).toContainText('Test Visible Setting')
   })
 })
diff --git a/src/components/dialog/content/setting/WorkspacePanel.vue b/src/components/dialog/content/setting/WorkspacePanel.vue
deleted file mode 100644
index 801b339d18..0000000000
--- a/src/components/dialog/content/setting/WorkspacePanel.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-  <div class="h-full">
-    <WorkspacePanelContent />
-  </div>
-</template>
-
-<script setup lang="ts">
-import WorkspacePanelContent from '@/components/dialog/content/setting/WorkspacePanelContent.vue'
-</script>
diff --git a/src/components/dialog/content/setting/WorkspacePanelContent.vue b/src/components/dialog/content/setting/WorkspacePanelContent.vue
index 4a390725bf..049b6456ab 100644
--- a/src/components/dialog/content/setting/WorkspacePanelContent.vue
+++ b/src/components/dialog/content/setting/WorkspacePanelContent.vue
@@ -75,12 +75,15 @@
       </template>
     </div>
 
-    <div v-if="activeTab === 'plan'" class="pt-4">
-      <SubscriptionPanelContentWorkspace />
-    </div>
-    <div v-else-if="activeTab === 'members'" class="pt-4">
-      <MembersPanelContent :key="workspaceRole" />
-    </div>
+    <SubscriptionPanelContentWorkspace
+      v-if="activeTab === 'plan'"
+      class="mt-4"
+    />
+    <MembersPanelContent
+      v-else-if="activeTab === 'members'"
+      :key="workspaceRole"
+      class="mt-4"
+    />
   </div>
 </template>
 
diff --git a/src/platform/settings/composables/useSettingUI.ts b/src/platform/settings/composables/useSettingUI.ts
index f9a0af8253..41d62ac868 100644
--- a/src/platform/settings/composables/useSettingUI.ts
+++ b/src/platform/settings/composables/useSettingUI.ts
@@ -168,7 +168,8 @@ export function useSettingUI(defaultPanel?: SettingPanelType) {
       children: []
     },
     component: defineAsyncComponent(
-      () => import('@/components/dialog/content/setting/WorkspacePanel.vue')
+      () =>
+        import('@/components/dialog/content/setting/WorkspacePanelContent.vue')
     )
   }