diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss
index 9f73e20ae..47beff574 100644
--- a/app/src/assets/scss/base.scss
+++ b/app/src/assets/scss/base.scss
@@ -251,6 +251,12 @@ progressLoading: 400
       }
     }
   }
+
+  &__text {
+    max-width: 96px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 }
 
 .status {
diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts
index 5a37c0ace..f4c515cef 100644
--- a/app/src/menus/workspace.ts
+++ b/app/src/menus/workspace.ts
@@ -4,7 +4,7 @@ import {dialog} from "@electron/remote";
 import {ipcRenderer} from "electron";
 /// #endif
 import {openHistory} from "../history/history";
-import {getOpenNotebookCount} from "../util/pathName";
+import {getOpenNotebookCount, originalPath} from "../util/pathName";
 import {mountHelp, newDailyNote} from "../util/mount";
 import {fetchPost} from "../util/fetch";
 import {Constants} from "../constants";
@@ -38,6 +38,7 @@ export const workspaceMenu = (rect: DOMRect) => {
                     if (!item.closed) {
                         submenu.push({
                             label: item.name,
+                            accelerator: window.siyuan.storage[Constants.LOCAL_DAILYNOTEID] === item.id ? window.siyuan.config.keymap.general.dailyNote.custom : "",
                             click: () => {
                                 fetchPost("/api/filetree/createDailyNote", {
                                     notebook: item.id,
@@ -52,7 +53,6 @@ export const workspaceMenu = (rect: DOMRect) => {
                 window.siyuan.menus.menu.append(new MenuItem({
                     label: window.siyuan.languages.dailyNote,
                     icon: "iconCalendar",
-                    accelerator: window.siyuan.config.keymap.general.dailyNote.custom,
                     type: "submenu",
                     submenu
                 }).element);
@@ -75,7 +75,7 @@ export const workspaceMenu = (rect: DOMRect) => {
         }).element);
         /// #if !BROWSER
         window.siyuan.menus.menu.append(new MenuItem({
-            label: window.siyuan.languages.openBy + "...",
+            label: window.siyuan.languages.openWorkspace,
             click: async () => {
                 const localPath = await dialog.showOpenDialog({
                     defaultPath: window.siyuan.config.system.homeDir,
@@ -97,7 +97,9 @@ export const workspaceMenu = (rect: DOMRect) => {
                 return;
             }
             window.siyuan.menus.menu.append(new MenuItem({
-                label: item.path,
+                label: `<div class="b3-tooltips b3-tooltips__e" aria-label="${item.path}">
+    <div class="fn__ellipsis" style="max-width: 256px">${originalPath().basename(item.path)}</div>
+</div>`,
                 click: () => {
                     openWorkspace(item.path);
                 }
@@ -110,7 +112,9 @@ export const workspaceMenu = (rect: DOMRect) => {
         }).element);
         response.data.forEach((item: IWorkspace) => {
             window.siyuan.menus.menu.append(new MenuItem({
-                label: item.path,
+                label: `<div class="b3-tooltips b3-tooltips__e" aria-label="${item.path}">
+    <div class="fn__ellipsis" style="max-width: 256px">${originalPath().basename(item.path)}</div>
+</div>`,
                 click: () => {
                     openWorkspace(item.path);
                 }
diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts
index 53eb37de0..4d8d91256 100644
--- a/app/src/util/onGetConfig.ts
+++ b/app/src/util/onGetConfig.ts
@@ -182,7 +182,7 @@ export const onGetConfig = (isStart: boolean) => {
 const initBar = () => {
     document.querySelector(".toolbar").innerHTML = `
 <div id="barWorkspace" class="toolbar__item">
-    ${originalPath().basename(window.siyuan.config.system.workspaceDir)}
+    <span class="toolbar__text">${originalPath().basename(window.siyuan.config.system.workspaceDir)}</span>
     <svg class="toolbar__svg"><use xlink:href="#iconDown"></use></svg>
 </div>
 <div id="barSync" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.config.sync.stat || (window.siyuan.languages.syncNow + " " + updateHotkeyTip(window.siyuan.config.keymap.general.syncNow.custom))}">