diff --git a/src/components/dialog/content/setting/WorkspacePanelContent.vue b/src/components/dialog/content/setting/WorkspacePanelContent.vue
index 0aea250d7b..b701c67bc5 100644
--- a/src/components/dialog/content/setting/WorkspacePanelContent.vue
+++ b/src/components/dialog/content/setting/WorkspacePanelContent.vue
@@ -150,7 +150,7 @@ const {
 const { fetchMembers, fetchPendingInvites } = workspaceStore
 
 const { workspaceRole, permissions, uiConfig } = useWorkspaceUI()
-const activeTab = ref('plan')
+const activeTab = ref(defaultTab)
 
 const menu = ref<InstanceType<typeof Menu> | null>(null)
 
@@ -225,7 +225,6 @@ const menuItems = computed(() => {
 })
 
 onMounted(() => {
-  activeTab.value = defaultTab
   fetchMembers()
   fetchPendingInvites()
 })
diff --git a/src/components/sidebar/ComfyMenuButton.vue b/src/components/sidebar/ComfyMenuButton.vue
index 3f5122a5f6..9a50b71d55 100644
--- a/src/components/sidebar/ComfyMenuButton.vue
+++ b/src/components/sidebar/ComfyMenuButton.vue
@@ -111,6 +111,7 @@ import { useI18n } from 'vue-i18n'
 import ComfyLogo from '@/components/icons/ComfyLogo.vue'
 import { useWorkflowTemplateSelectorDialog } from '@/composables/useWorkflowTemplateSelectorDialog'
 import { useSettingStore } from '@/platform/settings/settingStore'
+import type { SettingPanelType } from '@/platform/settings/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useColorPaletteService } from '@/services/colorPaletteService'
 import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
@@ -164,8 +165,8 @@ const translateMenuItem = (item: MenuItem): MenuItem => {
   }
 }
 
-const showSettings = (defaultPanel?: string) => {
-  settingsDialog.show(defaultPanel as Parameters<typeof settingsDialog.show>[0])
+const showSettings = (defaultPanel?: SettingPanelType) => {
+  settingsDialog.show(defaultPanel)
 }
 
 const showManageExtensions = async () => {
diff --git a/src/platform/settings/composables/useSettingUI.ts b/src/platform/settings/composables/useSettingUI.ts
index 41d62ac868..eba3f9be24 100644
--- a/src/platform/settings/composables/useSettingUI.ts
+++ b/src/platform/settings/composables/useSettingUI.ts
@@ -28,7 +28,9 @@ const CATEGORY_ICONS: Record<string, string> = {
   keybinding: 'icon-[lucide--keyboard]',
   extension: 'icon-[lucide--puzzle]',
   'server-config': 'icon-[lucide--server]',
-  PlanCredits: 'icon-[lucide--credit-card]'
+  PlanCredits: 'icon-[lucide--credit-card]',
+  subscription: 'icon-[lucide--credit-card]',
+  secrets: 'icon-[lucide--key-round]'
 }
 
 interface SettingPanelItem {