diff --git a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx
index 8b45e3377e..53b4a1b177 100644
--- a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx
+++ b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx
@@ -808,13 +808,29 @@ function CommandPaletteInner({
     const _query = deburr(
       commandSearch.toLocaleLowerCase().replace(/[<>_| -]/g, ""),
     );
-    matchingCommands = fuzzy
+
+    const matchingCommandsHaystack = fuzzy
       .filter(_query, matchingCommands, {
         extract: (command) => command.haystack,
       })
       .sort((a, b) => b.score - a.score)
       .map((item) => item.original);
 
+    const matchingCommandsShortcut = fuzzy
+      .filter(_query, matchingCommands, {
+        extract: (command) => command.shortcut || "",
+      })
+      .sort((a, b) => b.score - a.score)
+      .map((item) => item.original)
+      .filter(
+        (item) =>
+          !matchingCommandsHaystack.some((item2) => item.label === item2.label),
+      );
+
+    matchingCommands = matchingCommandsHaystack.concat(
+      matchingCommandsShortcut,
+    );
+
     setCommandsByCategory(getNextCommandsByCategory(matchingCommands));
     setCurrentCommand(matchingCommands[0] ?? null);
   }, [commandSearch, allCommands, isCommandAvailable, lastUsed]);