diff --git a/src/frontend/src/constants/constants.ts b/src/frontend/src/constants/constants.ts
index 8de6c3eb1..94bc0c0e3 100644
--- a/src/frontend/src/constants/constants.ts
+++ b/src/frontend/src/constants/constants.ts
@@ -760,106 +760,132 @@ export const IS_MAC = navigator.userAgent.toUpperCase().includes("MAC");
 
 export const defaultShortcuts = [
   {
+    display_name: "Controls",
     name: "Advanced Settings",
     shortcut: "mod+shift+a",
   },
   {
+    display_name: "Minimize",
     name: "Minimize",
     shortcut: "mod+.",
   },
   {
+    display_name: "Code",
     name: "Code",
     shortcut: "space",
   },
   {
+    display_name: "Copy",
     name: "Copy",
     shortcut: "mod+c",
   },
   {
+    display_name: "Duplicate",
     name: "Duplicate",
     shortcut: "mod+d",
   },
   {
+    display_name: "Component Share",
     name: "Component Share",
     shortcut: "mod+shift+s",
   },
   {
+    display_name: "Docs",
     name: "Docs",
     shortcut: "mod+shift+d",
   },
   {
+    display_name: "Changes Save",
     name: "Changes Save",
     shortcut: "mod+s",
   },
   {
+    display_name: "Save Component",
     name: "Save Component",
     shortcut: "mod+alt+s",
   },
   {
+    display_name: "Delete",
     name: "Delete",
     shortcut: "backspace",
   },
   {
+    display_name: "Open playground",
     name: "Open playground",
     shortcut: "mod+k",
   },
   {
+    display_name: "Undo",
     name: "Undo",
     shortcut: "mod+z",
   },
   {
+    display_name: "Redo",
     name: "Redo",
     shortcut: "mod+y",
   },
   {
+    display_name: "Group",
     name: "Group",
     shortcut: "mod+g",
   },
   {
+    display_name: "Cut",
     name: "Cut",
     shortcut: "mod+x",
   },
   {
+    display_name: "Paste",
     name: "Paste",
     shortcut: "mod+v",
   },
   {
+    display_name: "API",
     name: "API",
     shortcut: "r",
   },
   {
+    display_name: "Download",
     name: "Download",
     shortcut: "mod+j",
   },
   {
+    display_name: "Update",
     name: "Update",
     shortcut: "mod+u",
   },
   {
+    display_name: "Freeze",
     name: "Freeze",
     shortcut: "mod+f",
   },
   {
+    display_name: "Freeze Path",
     name: "Freeze Path",
     shortcut: "mod+shift+f",
   },
   {
+    display_name: "Flow Share",
     name: "Flow Share",
     shortcut: "mod+shift+b",
   },
   {
+    display_name: "Play",
     name: "Play",
     shortcut: "p",
   },
   {
+    display_name: "Output Inspection",
     name: "Output Inspection",
     shortcut: "o",
   },
   {
+    display_name: "Tool Mode",
     name: "Tool Mode",
     shortcut: "mod+shift+m",
   },
   {
+    display_name: "Toggle Sidebar",
     name: "Toggle Sidebar",
     shortcut: "mod+b",
   },
diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/shortcutDisplay/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/shortcutDisplay/index.tsx
index f10b4d283..8badd89f5 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/shortcutDisplay/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/shortcutDisplay/index.tsx
@@ -2,11 +2,11 @@ import RenderIcons from "@/components/common/renderIconComponent";
 import { cn } from "@/utils/utils";
 
 export default function ShortcutDisplay({
-  name,
+  display_name,
   shortcut,
   sidebar = false,
 }: {
-  name?: string;
+  display_name?: string;
   shortcut: string;
   sidebar?: boolean;
 }): JSX.Element {
@@ -15,11 +15,11 @@ export default function ShortcutDisplay({
     <>
       {sidebar ? (
         <div className="flex justify-center">
-          {name && <span> {name} </span>}
+          {display_name && <span> {display_name} </span>}
           <span
             className={cn(
               "flex h-[16px] w-[16px] items-center justify-center rounded-sm bg-muted text-muted-foreground",
-              name && "ml-3",
+              display_name && "ml-3",
             )}
           >
             <RenderIcons filteredShortcut={fixedShortcut} />
@@ -27,7 +27,7 @@ export default function ShortcutDisplay({
         </div>
       ) : (
         <div className="flex content-center items-center justify-center self-center text-[12px]">
-          <span> {name} </span>
+          <span> {display_name} </span>
           <span
             className={`ml-3 flex items-center rounded-sm bg-primary-hover px-1.5 py-[0.1em] text-muted`}
           >
diff --git a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
index 04415db31..263efc51d 100644
--- a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
+++ b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
@@ -18,7 +18,7 @@ export default function ShortcutsPage() {
   const colDefs: ColDef[] = [
     {
       headerName: "Functionality",
-      field: "name",
+      field: "display_name",
       flex: 1,
       editable: false,
       resizable: false,
diff --git a/src/frontend/src/types/store/index.ts b/src/frontend/src/types/store/index.ts
index e26f100c0..8c7370e7e 100644
--- a/src/frontend/src/types/store/index.ts
+++ b/src/frontend/src/types/store/index.ts
@@ -49,10 +49,15 @@ export type shortcutsStoreType = {
   toolMode: string;
   shortcuts: Array<{
     name: string;
+    display_name: string;
     shortcut: string;
   }>;
   setShortcuts: (
-    newShortcuts: Array<{ name: string; shortcut: string }>,
+    newShortcuts: Array<{
+      name: string;
+      display_name: string;
+      shortcut: string;
+    }>,
   ) => void;
   getShortcutsFromStorage: () => void;
 };
diff --git a/src/frontend/tests/extended/features/userSettings.spec.ts b/src/frontend/tests/extended/features/userSettings.spec.ts
index 3f518d091..dc1925656 100644
--- a/src/frontend/tests/extended/features/userSettings.spec.ts
+++ b/src/frontend/tests/extended/features/userSettings.spec.ts
@@ -136,9 +136,7 @@ test("should see shortcuts", { tag: ["@release"] }, async ({ page }) => {
   await page.getByText("General").nth(2).isVisible();
   await page.getByText("Shortcuts").nth(0).click();
   await page.getByText("Shortcuts", { exact: true }).nth(1).isVisible();
-  await page
-    .getByText("Advanced Settings Component", { exact: true })
-    .isVisible();
+  await page.getByText("Controls Component", { exact: true }).isVisible();
   await page.getByText("Minimize Component", { exact: true }).isVisible();
   await page.getByText("Code Component", { exact: true }).isVisible();
   await page.getByText("Copy Component", { exact: true }).isVisible();