diff --git a/frontend/src/components/layout/Workspace.vue b/frontend/src/components/layout/Workspace.vue
index 579f6163..11255947 100644
--- a/frontend/src/components/layout/Workspace.vue
+++ b/frontend/src/components/layout/Workspace.vue
@@ -103,25 +103,28 @@ onMounted(async () => {
         </template>
       </el-input>
       <div class="popover-content">
-        <div
-          v-for="ele in defaultWorkspaceListWithSearch"
-          :key="ele.name"
-          class="popover-item"
-          :class="currentWorkspace.id === ele.id && 'isActive'"
-          @click="handleDefaultWorkspaceChange(ele)"
-        >
-          <el-icon size="16">
-            <icon_moments_categories_outlined></icon_moments_categories_outlined>
-          </el-icon>
+        <el-scrollbar max-height="400px">
           <div
-            :title="ele.name"
-            class="datasource-name ellipsis"
-            v-html="formatKeywords(ele.name)"
-          ></div>
-          <el-icon size="16" class="done">
-            <icon_done_outlined></icon_done_outlined>
-          </el-icon>
-        </div>
+            v-for="ele in defaultWorkspaceListWithSearch"
+            :key="ele.name"
+            class="popover-item"
+            :class="currentWorkspace.id === ele.id && 'isActive'"
+            @click="handleDefaultWorkspaceChange(ele)"
+          >
+            <el-icon size="16">
+              <icon_moments_categories_outlined></icon_moments_categories_outlined>
+            </el-icon>
+            <div
+              :title="ele.name"
+              class="datasource-name ellipsis"
+              v-html="formatKeywords(ele.name)"
+            ></div>
+            <el-icon size="16" class="done">
+              <icon_done_outlined></icon_done_outlined>
+            </el-icon>
+          </div>
+        </el-scrollbar>
+
         <div v-if="!defaultWorkspaceListWithSearch.length" class="popover-item empty">
           {{ $t('model.relevant_results_found') }}
         </div>
diff --git a/frontend/src/views/system/embedded/Card.vue b/frontend/src/views/system/embedded/Card.vue
index 5d8d0035..b4dd726e 100644
--- a/frontend/src/views/system/embedded/Card.vue
+++ b/frontend/src/views/system/embedded/Card.vue
@@ -38,7 +38,7 @@ const handleEmbedded = () => {
   <div class="card">
     <div class="name-icon">
       <img :src="Lock" width="32px" height="32px" />
-      <span class="name">{{ name }}</span>
+      <span class="name ellipsis" :title="name">{{ name }}</span>
       <span class="default" :class="isBase && 'is-base'">{{
         isBase ? $t('embedded.basic_application') : $t('embedded.advanced_application')
       }}</span>
@@ -88,6 +88,7 @@ const handleEmbedded = () => {
       font-weight: 500;
       font-size: 16px;
       line-height: 24px;
+      max-width: 200px;
     }
 
     .default {