diff --git a/ui/src/layout/layout-header/UserHeader.vue b/ui/src/layout/layout-header/UserHeader.vue
index f669c9154..fe4e11c07 100644
--- a/ui/src/layout/layout-header/UserHeader.vue
+++ b/ui/src/layout/layout-header/UserHeader.vue
@@ -4,8 +4,12 @@
     <div class="logo mt-4">
       <LogoFull />
     </div>
-    <el-divider direction="vertical" class="ml-24 mr-24" />
-    <Workspace />
+    <el-divider
+      direction="vertical"
+      class="ml-24 mr-24"
+      v-if="hasPermission(EditionConst.IS_EE, 'OR')"
+    />
+    <WorkspaceDropdown v-if="hasPermission(EditionConst.IS_EE, 'OR')" />
     <div class="flex-between w-full">
       <div></div>
       <TopMenu></TopMenu>
@@ -18,10 +22,14 @@
 import TopMenu from './top-menu/index.vue'
 import Avatar from './avatar/index.vue'
 import TopAbout from './top-about/index.vue'
-import Workspace from './workspace/index.vue'
-import { useRouter } from 'vue-router'
+import { EditionConst } from '@/utils/permission/data'
+import { hasPermission } from '@/utils/permission/index'
+import WorkspaceDropdown from './workspace-dropdown/index.vue'
 
+import { useRouter } from 'vue-router'
+import useStore from '@/stores'
 const router = useRouter()
+const { user } = useStore()
 </script>
 <style lang="scss" scoped>
 .app-top-bar-container {
diff --git a/ui/src/layout/layout-header/workspace/index.vue b/ui/src/layout/layout-header/workspace-dropdown/index.vue
similarity index 98%
rename from ui/src/layout/layout-header/workspace/index.vue
rename to ui/src/layout/layout-header/workspace-dropdown/index.vue
index acf5e3aa2..b1731a73f 100644
--- a/ui/src/layout/layout-header/workspace/index.vue
+++ b/ui/src/layout/layout-header/workspace-dropdown/index.vue
@@ -45,7 +45,7 @@ async function getWorkspaceList() {
 }
 
 onBeforeMount(async () => {
-  // await getWorkspaceList()
+  await getWorkspaceList()
   const id = localStorage.getItem('workspace_id') ?? 'default'
   currentWorkspace.value = workspaceList.value.find(item => item.id === id)
 })
diff --git a/ui/src/stores/modules/user.ts b/ui/src/stores/modules/user.ts
index 15ac59fd1..a06917eda 100644
--- a/ui/src/stores/modules/user.ts
+++ b/ui/src/stores/modules/user.ts
@@ -77,7 +77,7 @@ const useUserStore = defineStore('user', {
             this.edition = ok.data.edition
 
             if (this.isEE() || this.isPE()) {
-              // await this.theme()
+              await this.theme()
             } else {
               this.themeInfo = {
                 ...defaultPlatformSetting,