diff --git a/app/src/menus/navigation.ts b/app/src/menus/navigation.ts
index 5a350ed64..3d0806f28 100644
--- a/app/src/menus/navigation.ts
+++ b/app/src/menus/navigation.ts
@@ -132,7 +132,7 @@ export const initNavigationMenu = (liElement: HTMLElement) => {
             iconHTML: Constants.ZWSP,
             label: window.siyuan.languages.mgmt,
             click: () => {
-                viewCards(notebookId, name, "Notebook");
+                viewCards(notebookId, escapeHtml(name), "Notebook");
             }
         }],
     }).element);
diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts
index 16a179dc9..651fbe7a5 100644
--- a/app/src/menus/workspace.ts
+++ b/app/src/menus/workspace.ts
@@ -17,6 +17,8 @@ import {lockScreen} from "../dialog/processSystem";
 import {showMessage} from "../dialog/message";
 import {unicode2Emoji} from "../emoji";
 import {Dock} from "../layout/dock";
+import {escapeHtml} from "../util/escape";
+import {viewCards} from "../card/viewCards";
 
 const togglePinDock = (dock: Dock, icon: string) => {
     return {
@@ -113,7 +115,7 @@ export const workspaceMenu = (rect: DOMRect) => {
                 window.siyuan.notebooks.forEach(item => {
                     if (!item.closed) {
                         submenu.push({
-                            label: item.name,
+                            label: escapeHtml(item.name),
                             iconHTML: unicode2Emoji(item.icon || Constants.SIYUAN_IMAGE_NOTE, false, "b3-menu__icon", true),
                             accelerator: window.siyuan.storage[Constants.LOCAL_DAILYNOTEID] === item.id ? window.siyuan.config.keymap.general.dailyNote.custom : "",
                             click: () => {
@@ -135,12 +137,23 @@ export const workspaceMenu = (rect: DOMRect) => {
                 }).element);
             }
             window.siyuan.menus.menu.append(new MenuItem({
-                label: window.siyuan.languages.spaceRepetition,
+                label: window.siyuan.languages.riffCard,
+                type: "submenu",
                 icon: "iconRiffCard",
-                accelerator: window.siyuan.config.keymap.general.riffCard.custom,
-                click: () => {
-                    openCard();
-                }
+                submenu: [{
+                    iconHTML: Constants.ZWSP,
+                    label: window.siyuan.languages.spaceRepetition,
+                    accelerator: window.siyuan.config.keymap.general.riffCard.custom,
+                    click: () => {
+                        openCard();
+                    }
+                }, {
+                    iconHTML: Constants.ZWSP,
+                    label: window.siyuan.languages.mgmt,
+                    click: () => {
+                        viewCards("", window.siyuan.languages.all, "");
+                    }
+                }],
             }).element);
         }
         window.siyuan.menus.menu.append(new MenuItem({
diff --git a/app/src/window/onWindowsMsg.ts b/app/src/window/onWindowsMsg.ts
index 863dd236a..191d476f9 100644
--- a/app/src/window/onWindowsMsg.ts
+++ b/app/src/window/onWindowsMsg.ts
@@ -8,7 +8,7 @@ const closeTab = (ipcData: IWebSocketData) => {
     if (tab && tab instanceof Tab) {
         tab.parent.removeTab(ipcData.data);
     }
-}
+};
 export const onWindowsMsg = (ipcData: IWebSocketData) => {
     switch (ipcData.cmd) {
         case "closetab":
@@ -26,4 +26,4 @@ export const onWindowsMsg = (ipcData: IWebSocketData) => {
             }
             break;
     }
-}
+};