diff --git a/browser_tests/tests/dialog.spec.ts b/browser_tests/tests/dialog.spec.ts
index 611c0c3c71..cef0cfa12b 100644
--- a/browser_tests/tests/dialog.spec.ts
+++ b/browser_tests/tests/dialog.spec.ts
@@ -328,9 +328,11 @@ test.describe('Settings', () => {
     })
     await newBlankWorkflowRow.click()
 
-    // Click edit button
-    const editKeybindingButton = newBlankWorkflowRow.locator('.pi-pencil')
-    await editKeybindingButton.click()
+    // Click add keybinding button (New Blank Workflow has no default keybinding)
+    const addKeybindingButton = newBlankWorkflowRow.locator(
+      '.icon-\\[lucide--plus\\]'
+    )
+    await addKeybindingButton.click()
 
     // Set new keybinding
     const input = comfyPage.page.getByPlaceholder('Enter your keybind')
diff --git a/src/components/dialog/content/setting/KeybindingPanel.vue b/src/components/dialog/content/setting/KeybindingPanel.vue
index db48f4d502..3fe79fc8f0 100644
--- a/src/components/dialog/content/setting/KeybindingPanel.vue
+++ b/src/components/dialog/content/setting/KeybindingPanel.vue
@@ -5,101 +5,257 @@
       :placeholder="$t('g.searchPlaceholder', { subject: $t('g.keybindings') })"
     />
 
-    <DataTable
-      v-model:selection="selectedCommandData"
-      :value="commandsData"
-      :global-filter-fields="['id', 'label']"
-      :filters="filters"
-      selection-mode="single"
-      striped-rows
-      :pt="{
-        header: 'px-0'
-      }"
-      @row-dblclick="editKeybinding($event.data)"
-    >
-      <Column field="actions" header="" :pt="{ bodyCell: 'p-1 min-h-8' }">
-        <template #body="slotProps">
-          <div class="actions flex flex-row">
-            <Button
-              variant="textonly"
-              size="icon"
-              :aria-label="$t('g.edit')"
-              @click="editKeybinding(slotProps.data)"
-            >
-              <i class="pi pi-pencil" />
-            </Button>
-            <Button
-              variant="textonly"
-              size="icon"
-              :aria-label="$t('g.reset')"
-              :disabled="
-                !keybindingStore.isCommandKeybindingModified(slotProps.data.id)
-              "
-              @click="resetKeybinding(slotProps.data)"
-            >
-              <i class="pi pi-replay" />
-            </Button>
-            <Button
-              variant="textonly"
-              size="icon"
-              :aria-label="$t('g.delete')"
-              :disabled="!slotProps.data.keybinding"
-              @click="removeKeybinding(slotProps.data)"
-            >
-              <i class="pi pi-trash" />
-            </Button>
-          </div>
-        </template>
-      </Column>
-      <Column
-        field="id"
-        :header="$t('g.command')"
-        sortable
-        class="max-w-64 2xl:max-w-full"
-        :pt="{ bodyCell: 'p-1 min-h-8' }"
-      >
-        <template #body="slotProps">
-          <div
-            class="flex items-center gap-1.5 truncate"
-            :title="slotProps.data.id"
+    <ContextMenuRoot>
+      <ContextMenuTrigger as-child>
+        <div @contextmenu.capture="clearContextMenuTarget">
+          <DataTable
+            v-model:selection="selectedCommandData"
+            v-model:expanded-rows="expandedRows"
+            :value="commandsData"
+            data-key="id"
+            :global-filter-fields="['id', 'label']"
+            :filters="filters"
+            selection-mode="single"
+            context-menu
+            striped-rows
+            :pt="{
+              header: 'px-0'
+            }"
+            @row-click="handleRowClick($event)"
+            @row-dblclick="handleRowDblClick($event.data)"
+            @row-contextmenu="handleRowContextMenu($event)"
           >
-            <i
-              v-if="slotProps.data.keybinding?.combo.isBrowserReserved"
-              v-tooltip="$t('g.browserReservedKeybindingTooltip')"
-              class="icon-[lucide--triangle-alert] shrink-0 text-warning-background"
-            />
-            {{ slotProps.data.label }}
-          </div>
-        </template>
-      </Column>
-      <Column
-        field="keybinding"
-        :header="$t('g.keybinding')"
-        :pt="{ bodyCell: 'p-1 min-h-8' }"
-      >
-        <template #body="slotProps">
-          <KeyComboDisplay
-            v-if="slotProps.data.keybinding"
-            :key-combo="slotProps.data.keybinding.combo"
-            :is-modified="
-              keybindingStore.isCommandKeybindingModified(slotProps.data.id)
+            <Column
+              field="id"
+              :header="$t('g.command')"
+              sortable
+              class="max-w-64 2xl:max-w-full"
+              :pt="{ bodyCell: 'p-1 min-h-8' }"
+            >
+              <template #body="slotProps">
+                <div
+                  class="flex items-center gap-1 truncate"
+                  :class="slotProps.data.keybindings.length < 2 && 'pl-5'"
+                  :title="slotProps.data.id"
+                >
+                  <i
+                    v-if="slotProps.data.keybindings.length >= 2"
+                    class="icon-[lucide--chevron-right] size-4 shrink-0 text-muted-foreground transition-transform"
+                    :class="
+                      expandedCommandIds.has(slotProps.data.id) && 'rotate-90'
+                    "
+                  />
+                  <i
+                    v-if="
+                      slotProps.data.keybindings.some(
+                        (b: KeybindingImpl) => b.combo.isBrowserReserved
+                      )
+                    "
+                    v-tooltip="$t('g.browserReservedKeybindingTooltip')"
+                    class="icon-[lucide--triangle-alert] shrink-0 text-warning-background"
+                  />
+                  {{ slotProps.data.label }}
+                </div>
+              </template>
+            </Column>
+            <Column
+              field="keybindings"
+              :header="$t('g.keybinding')"
+              :pt="{ bodyCell: 'p-1 min-h-8' }"
+            >
+              <template #body="slotProps">
+                <div
+                  v-if="slotProps.data.keybindings.length > 0"
+                  class="flex items-center gap-1"
+                >
+                  <template
+                    v-for="(binding, idx) in (
+                      slotProps.data as ICommandData
+                    ).keybindings.slice(0, 2)"
+                    :key="binding.combo.serialize()"
+                  >
+                    <span v-if="idx > 0" class="text-muted-foreground">,</span>
+                    <KeyComboDisplay
+                      :key-combo="binding.combo"
+                      :is-modified="
+                        keybindingStore.isCommandKeybindingModified(
+                          slotProps.data.id
+                        )
+                      "
+                    />
+                  </template>
+                  <span
+                    v-if="slotProps.data.keybindings.length > 2"
+                    class="rounded-sm px-1.5 py-0.5 text-xs text-muted-foreground"
+                  >
+                    {{
+                      $t('g.nMoreKeybindings', {
+                        count: slotProps.data.keybindings.length - 2
+                      })
+                    }}
+                  </span>
+                </div>
+                <span v-else>-</span>
+              </template>
+            </Column>
+            <Column
+              field="source"
+              :header="$t('g.source')"
+              :pt="{ bodyCell: 'p-1 min-h-8' }"
+            >
+              <template #body="slotProps">
+                <span class="overflow-hidden text-ellipsis">{{
+                  slotProps.data.source || '-'
+                }}</span>
+              </template>
+            </Column>
+            <Column field="actions" header="" :pt="{ bodyCell: 'p-1 min-h-8' }">
+              <template #body="slotProps">
+                <div class="actions flex flex-row justify-end">
+                  <Button
+                    v-if="slotProps.data.keybindings.length === 1"
+                    v-tooltip="$t('g.edit')"
+                    variant="textonly"
+                    size="icon"
+                    :aria-label="$t('g.edit')"
+                    @click="
+                      editKeybinding(
+                        slotProps.data,
+                        slotProps.data.keybindings[0]
+                      )
+                    "
+                  >
+                    <i class="icon-[lucide--pencil]" />
+                  </Button>
+                  <Button
+                    v-tooltip="$t('g.addNewKeybinding')"
+                    variant="textonly"
+                    size="icon"
+                    :aria-label="$t('g.addNewKeybinding')"
+                    @click="addKeybinding(slotProps.data)"
+                  >
+                    <i class="icon-[lucide--plus]" />
+                  </Button>
+                  <Button
+                    v-tooltip="$t('g.reset')"
+                    variant="textonly"
+                    size="icon"
+                    :aria-label="$t('g.reset')"
+                    :disabled="
+                      !keybindingStore.isCommandKeybindingModified(
+                        slotProps.data.id
+                      )
+                    "
+                    @click="resetKeybinding(slotProps.data)"
+                  >
+                    <i class="icon-[lucide--rotate-ccw]" />
+                  </Button>
+                  <Button
+                    v-tooltip="$t('g.delete')"
+                    variant="textonly"
+                    size="icon"
+                    :aria-label="$t('g.delete')"
+                    :disabled="slotProps.data.keybindings.length === 0"
+                    @click="handleRemoveKeybindingFromMenu(slotProps.data)"
+                  >
+                    <i class="icon-[lucide--trash-2]" />
+                  </Button>
+                </div>
+              </template>
+            </Column>
+            <template #expansion="slotProps">
+              <div class="pl-4">
+                <div
+                  v-for="(binding, idx) in (slotProps.data as ICommandData)
+                    .keybindings"
+                  :key="binding.combo.serialize()"
+                  class="flex items-center justify-between border-b border-border-subtle py-1.5 last:border-b-0"
+                >
+                  <div class="flex items-center gap-4">
+                    <span class="text-muted-foreground">{{
+                      slotProps.data.label
+                    }}</span>
+                    <KeyComboDisplay
+                      :key-combo="binding.combo"
+                      :is-modified="
+                        keybindingStore.isCommandKeybindingModified(
+                          slotProps.data.id
+                        )
+                      "
+                    />
+                  </div>
+                  <div class="flex flex-row">
+                    <Button
+                      v-tooltip="$t('g.edit')"
+                      variant="textonly"
+                      size="icon"
+                      :aria-label="$t('g.edit')"
+                      @click="editKeybinding(slotProps.data, binding)"
+                    >
+                      <i class="icon-[lucide--pencil]" />
+                    </Button>
+                    <Button
+                      v-tooltip="$t('g.removeKeybinding')"
+                      variant="textonly"
+                      size="icon"
+                      :aria-label="$t('g.removeKeybinding')"
+                      @click="removeSingleKeybinding(slotProps.data, idx)"
+                    >
+                      <i class="icon-[lucide--trash-2]" />
+                    </Button>
+                  </div>
+                </div>
+              </div>
+            </template>
+          </DataTable>
+        </div>
+      </ContextMenuTrigger>
+      <ContextMenuPortal>
+        <ContextMenuContent
+          class="z-1200 min-w-56 rounded-lg border border-border-subtle bg-base-background px-2 py-3 shadow-interface"
+        >
+          <ContextMenuItem
+            class="flex cursor-pointer items-center gap-2 rounded-sm px-3 py-2 text-sm text-text-primary outline-none select-none hover:bg-node-component-surface-hovered focus:bg-node-component-surface-hovered data-disabled:cursor-default data-disabled:opacity-50"
+            :disabled="
+              !contextMenuTarget || contextMenuTarget.keybindings.length === 0
             "
-          />
-          <span v-else>-</span>
-        </template>
-      </Column>
-      <Column
-        field="source"
-        :header="$t('g.source')"
-        :pt="{ bodyCell: 'p-1 min-h-8' }"
-      >
-        <template #body="slotProps">
-          <span class="overflow-hidden text-ellipsis">{{
-            slotProps.data.source || '-'
-          }}</span>
-        </template>
-      </Column>
-    </DataTable>
+            @select="ctxChangeKeybinding"
+          >
+            <i class="icon-[lucide--pencil] size-4" />
+            {{ $t('g.changeKeybinding') }}
+          </ContextMenuItem>
+          <ContextMenuItem
+            class="flex cursor-pointer items-center gap-2 rounded-sm px-3 py-2 text-sm text-text-primary outline-none select-none hover:bg-node-component-surface-hovered focus:bg-node-component-surface-hovered"
+            @select="ctxAddKeybinding"
+          >
+            <i class="icon-[lucide--plus] size-4" />
+            {{ $t('g.addNewKeybinding') }}
+          </ContextMenuItem>
+          <ContextMenuSeparator class="my-1 h-px bg-border-subtle" />
+          <ContextMenuItem
+            class="flex cursor-pointer items-center gap-2 rounded-sm px-3 py-2 text-sm text-text-primary outline-none select-none hover:bg-node-component-surface-hovered focus:bg-node-component-surface-hovered data-disabled:cursor-default data-disabled:opacity-50"
+            :disabled="
+              !contextMenuTarget ||
+              !keybindingStore.isCommandKeybindingModified(contextMenuTarget.id)
+            "
+            @select="ctxResetToDefault"
+          >
+            <i class="icon-[lucide--rotate-ccw] size-4" />
+            {{ $t('g.resetToDefault') }}
+          </ContextMenuItem>
+          <ContextMenuItem
+            class="flex cursor-pointer items-center gap-2 rounded-sm px-3 py-2 text-sm text-text-primary outline-none select-none hover:bg-node-component-surface-hovered focus:bg-node-component-surface-hovered data-disabled:cursor-default data-disabled:opacity-50"
+            :disabled="
+              !contextMenuTarget || contextMenuTarget.keybindings.length === 0
+            "
+            @select="ctxRemoveKeybinding"
+          >
+            <i class="icon-[lucide--trash-2] size-4" />
+            {{ $t('g.removeKeybinding') }}
+          </ContextMenuItem>
+        </ContextMenuContent>
+      </ContextMenuPortal>
+    </ContextMenuRoot>
 
     <Button
       v-tooltip="$t('g.resetAllKeybindingsTooltip')"
@@ -107,7 +263,7 @@
       variant="destructive-textonly"
       @click="resetAllKeybindings"
     >
-      <i class="pi pi-replay" />
+      <i class="icon-[lucide--rotate-ccw]" />
       {{ $t('g.resetAll') }}
     </Button>
   </div>
@@ -118,16 +274,26 @@ import { FilterMatchMode } from '@primevue/core/api'
 import Column from 'primevue/column'
 import DataTable from 'primevue/datatable'
 import { useToast } from 'primevue/usetoast'
-import { computed, ref } from 'vue'
+import {
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuPortal,
+  ContextMenuRoot,
+  ContextMenuSeparator,
+  ContextMenuTrigger
+} from 'reka-ui'
+import { computed, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import SearchInput from '@/components/ui/search-input/SearchInput.vue'
+import { showConfirmDialog } from '@/components/dialog/confirm/confirmDialog'
 import Button from '@/components/ui/button/Button.vue'
+import SearchInput from '@/components/ui/search-input/SearchInput.vue'
 import { useEditKeybindingDialog } from '@/composables/useEditKeybindingDialog'
 import type { KeybindingImpl } from '@/platform/keybindings/keybinding'
 import { useKeybindingService } from '@/platform/keybindings/keybindingService'
 import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
 import { useCommandStore } from '@/stores/commandStore'
+import { useDialogStore } from '@/stores/dialogStore'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 
 import KeyComboDisplay from './keybinding/KeyComboDisplay.vue'
@@ -139,11 +305,12 @@ const filters = ref({
 const keybindingStore = useKeybindingStore()
 const keybindingService = useKeybindingService()
 const commandStore = useCommandStore()
+const dialogStore = useDialogStore()
 const { t } = useI18n()
 
 interface ICommandData {
   id: string
-  keybinding: KeybindingImpl | null
+  keybindings: KeybindingImpl[]
   label: string
   source?: string
 }
@@ -155,31 +322,166 @@ const commandsData = computed<ICommandData[]>(() => {
       `commands.${normalizeI18nKey(command.id)}.label`,
       command.label ?? ''
     ),
-    keybinding: keybindingStore.getKeybindingByCommandId(command.id),
+    keybindings: keybindingStore.getKeybindingsByCommandId(command.id),
     source: command.source
   }))
 })
 
+const expandedCommandIds = ref<Set<string>>(new Set())
+
+const expandedRows = computed({
+  get() {
+    const result: Record<string, boolean> = {}
+    for (const id of expandedCommandIds.value) {
+      result[id] = true
+    }
+    return result
+  },
+  set(value: Record<string, boolean>) {
+    expandedCommandIds.value = new Set(Object.keys(value))
+  }
+})
+
+function toggleExpanded(commandId: string) {
+  if (expandedCommandIds.value.has(commandId)) {
+    expandedCommandIds.value.delete(commandId)
+  } else {
+    expandedCommandIds.value.add(commandId)
+  }
+}
+
+watch(filters, () => expandedCommandIds.value.clear(), { deep: true })
+
 const selectedCommandData = ref<ICommandData | null>(null)
 const editKeybindingDialog = useEditKeybindingDialog()
 
-function editKeybinding(commandData: ICommandData) {
+const contextMenuTarget = ref<ICommandData | null>(null)
+
+function editKeybinding(commandData: ICommandData, binding: KeybindingImpl) {
   editKeybindingDialog.show({
     commandId: commandData.id,
     commandLabel: commandData.label,
-    currentCombo: commandData.keybinding?.combo ?? null
+    currentCombo: binding.combo,
+    mode: 'edit',
+    existingBinding: binding
   })
 }
 
-async function removeKeybinding(commandData: ICommandData) {
-  if (commandData.keybinding) {
-    keybindingStore.unsetKeybinding(commandData.keybinding)
+function addKeybinding(commandData: ICommandData) {
+  editKeybindingDialog.show({
+    commandId: commandData.id,
+    commandLabel: commandData.label,
+    currentCombo: null,
+    mode: 'add'
+  })
+}
+
+function handleRowClick(event: { originalEvent: Event; data: ICommandData }) {
+  const target = event.originalEvent.target as HTMLElement
+  if (target.closest('.actions')) return
+  const commandData = event.data
+  if (
+    commandData.keybindings.length >= 2 ||
+    expandedCommandIds.value.has(commandData.id)
+  ) {
+    toggleExpanded(commandData.id)
+  }
+}
+
+function handleRowDblClick(commandData: ICommandData) {
+  if (commandData.keybindings.length === 0) {
+    addKeybinding(commandData)
+  } else if (commandData.keybindings.length === 1) {
+    editKeybinding(commandData, commandData.keybindings[0])
+  }
+}
+
+function handleRowContextMenu(event: {
+  originalEvent: Event
+  data: ICommandData
+}) {
+  contextMenuTarget.value = event.data
+}
+
+function clearContextMenuTarget() {
+  contextMenuTarget.value = null
+}
+
+async function removeSingleKeybinding(
+  commandData: ICommandData,
+  index: number
+) {
+  const binding = commandData.keybindings[index]
+  if (binding) {
+    keybindingStore.unsetKeybinding(binding)
+    if (commandData.keybindings.length <= 2) {
+      expandedCommandIds.value.delete(commandData.id)
+    }
     await keybindingService.persistUserKeybindings()
   }
 }
 
+function handleRemoveAllKeybindings(commandData: ICommandData) {
+  const dialog = showConfirmDialog({
+    headerProps: { title: t('g.removeAllKeybindingsTitle') },
+    props: { promptText: t('g.removeAllKeybindingsMessage') },
+    footerProps: {
+      confirmText: t('g.removeAll'),
+      confirmVariant: 'destructive',
+      onCancel: () => dialogStore.closeDialog(dialog),
+      onConfirm: async () => {
+        keybindingStore.removeAllKeybindingsForCommand(commandData.id)
+        await keybindingService.persistUserKeybindings()
+        dialogStore.closeDialog(dialog)
+      }
+    }
+  })
+}
+
+function handleRemoveKeybindingFromMenu(commandData: ICommandData) {
+  if (commandData.keybindings.length >= 2) {
+    handleRemoveAllKeybindings(commandData)
+  } else {
+    removeSingleKeybinding(commandData, 0)
+  }
+}
+
+function ctxChangeKeybinding() {
+  if (!contextMenuTarget.value) return
+  const target = contextMenuTarget.value
+  if (target.keybindings.length === 1) {
+    editKeybinding(target, target.keybindings[0])
+  } else if (target.keybindings.length >= 2) {
+    if (!expandedCommandIds.value.has(target.id)) {
+      toggleExpanded(target.id)
+    }
+  }
+}
+
+function ctxAddKeybinding() {
+  if (contextMenuTarget.value) {
+    addKeybinding(contextMenuTarget.value)
+  }
+}
+
+function ctxResetToDefault() {
+  if (contextMenuTarget.value) {
+    resetKeybinding(contextMenuTarget.value)
+  }
+}
+
+function ctxRemoveKeybinding() {
+  if (
+    contextMenuTarget.value &&
+    contextMenuTarget.value.keybindings.length > 0
+  ) {
+    handleRemoveKeybindingFromMenu(contextMenuTarget.value)
+  }
+}
+
 async function resetKeybinding(commandData: ICommandData) {
   if (keybindingStore.resetKeybindingForCommand(commandData.id)) {
+    expandedCommandIds.value.delete(commandData.id)
     await keybindingService.persistUserKeybindings()
   } else {
     console.warn(
@@ -189,14 +491,33 @@ async function resetKeybinding(commandData: ICommandData) {
 }
 
 const toast = useToast()
-async function resetAllKeybindings() {
-  keybindingStore.resetAllKeybindings()
-  await keybindingService.persistUserKeybindings()
-  toast.add({
-    severity: 'info',
-    summary: 'Info',
-    detail: 'All keybindings reset',
-    life: 3000
+
+function resetAllKeybindings() {
+  const dialog = showConfirmDialog({
+    headerProps: {
+      title: t('g.resetAllKeybindingsTitle')
+    },
+    props: {
+      promptText: t('g.resetAllKeybindingsMessage')
+    },
+    footerProps: {
+      confirmText: t('g.resetAll'),
+      confirmVariant: 'destructive',
+      onCancel: () => {
+        dialogStore.closeDialog(dialog)
+      },
+      onConfirm: async () => {
+        keybindingStore.resetAllKeybindings()
+        await keybindingService.persistUserKeybindings()
+        dialogStore.closeDialog(dialog)
+        toast.add({
+          severity: 'info',
+          summary: t('g.info'),
+          detail: t('g.allKeybindingsReset'),
+          life: 3000
+        })
+      }
+    }
   })
 }
 </script>
diff --git a/src/components/dialog/content/setting/keybinding/EditKeybindingFooter.vue b/src/components/dialog/content/setting/keybinding/EditKeybindingFooter.vue
index 77b0fb85ce..012e5fce9c 100644
--- a/src/components/dialog/content/setting/keybinding/EditKeybindingFooter.vue
+++ b/src/components/dialog/content/setting/keybinding/EditKeybindingFooter.vue
@@ -64,9 +64,18 @@ async function handleSave() {
 
   dialogStore.closeDialog({ key: DIALOG_KEY })
 
-  const updated = keybindingStore.updateKeybindingOnCommand(
-    new KeybindingImpl({ commandId, combo })
-  )
-  if (updated) await keybindingService.persistUserKeybindings()
+  if (dialogState.mode === 'add') {
+    keybindingStore.addUserKeybinding(new KeybindingImpl({ commandId, combo }))
+  } else if (dialogState.existingBinding) {
+    keybindingStore.updateSpecificKeybinding(
+      dialogState.existingBinding,
+      new KeybindingImpl({ commandId, combo })
+    )
+  } else {
+    keybindingStore.updateKeybindingOnCommand(
+      new KeybindingImpl({ commandId, combo })
+    )
+  }
+  await keybindingService.persistUserKeybindings()
 }
 </script>
diff --git a/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue b/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
index 911a0f41b8..6e87002777 100644
--- a/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
+++ b/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
@@ -1,7 +1,10 @@
 <template>
   <span>
     <template v-for="(sequence, index) in keySequences" :key="index">
-      <Tag :severity="isModified ? 'info' : 'secondary'">
+      <Tag
+        class="bg-interface-menu-keybind-surface-default text-base-foreground"
+        :severity="isModified ? 'info' : 'secondary'"
+      >
         {{ sequence }}
       </Tag>
       <span v-if="index < keySequences.length - 1" class="px-2">+</span>
diff --git a/src/composables/useEditKeybindingDialog.ts b/src/composables/useEditKeybindingDialog.ts
index 4cb367d891..82b7fff97c 100644
--- a/src/composables/useEditKeybindingDialog.ts
+++ b/src/composables/useEditKeybindingDialog.ts
@@ -4,6 +4,7 @@ import EditKeybindingContent from '@/components/dialog/content/setting/keybindin
 import EditKeybindingFooter from '@/components/dialog/content/setting/keybinding/EditKeybindingFooter.vue'
 import EditKeybindingHeader from '@/components/dialog/content/setting/keybinding/EditKeybindingHeader.vue'
 import type { KeyComboImpl } from '@/platform/keybindings/keyCombo'
+import type { KeybindingImpl } from '@/platform/keybindings/keybinding'
 import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
 import { useDialogService } from '@/services/dialogService'
 
@@ -13,6 +14,8 @@ export interface EditKeybindingDialogState {
   commandId: string
   newCombo: KeyComboImpl | null
   currentCombo: KeyComboImpl | null
+  mode: 'edit' | 'add'
+  existingBinding: KeybindingImpl | null
 }
 
 export function useEditKeybindingDialog() {
@@ -23,11 +26,15 @@ export function useEditKeybindingDialog() {
     commandId: string
     commandLabel: string
     currentCombo: KeyComboImpl | null
+    mode?: 'edit' | 'add'
+    existingBinding?: KeybindingImpl | null
   }) {
     const dialogState = reactive<EditKeybindingDialogState>({
       commandId: options.commandId,
       newCombo: options.currentCombo,
-      currentCombo: options.currentCombo
+      currentCombo: options.currentCombo,
+      mode: options.mode ?? 'edit',
+      existingBinding: options.existingBinding ?? null
     })
 
     const existingKeybindingOnCombo = computed(() => {
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index 0447fc85ea..6a280c636e 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -69,6 +69,17 @@
     "resetAll": "Reset All",
     "clearFilters": "Clear Filters",
     "resetAllKeybindingsTooltip": "Reset all keybindings to default",
+    "resetAllKeybindingsTitle": "Reset all keybindings?",
+    "resetAllKeybindingsMessage": "All keybindings will be reset to their default values. This cannot be undone.",
+    "allKeybindingsReset": "All keybindings reset to default",
+    "removeAllKeybindingsTitle": "Remove all keybindings?",
+    "removeAllKeybindingsMessage": "All keybindings for this command will be removed",
+    "removeAll": "Remove all",
+    "changeKeybinding": "Change keybinding",
+    "addNewKeybinding": "Add new keybinding",
+    "resetToDefault": "Reset to default",
+    "removeKeybinding": "Remove keybinding",
+    "nMoreKeybindings": "+ {count} more",
     "customizeFolder": "Customize Folder",
     "icon": "Icon",
     "color": "Color",
diff --git a/src/platform/keybindings/keybindingStore.test.ts b/src/platform/keybindings/keybindingStore.test.ts
index 15f16444f5..3ce4c195ba 100644
--- a/src/platform/keybindings/keybindingStore.test.ts
+++ b/src/platform/keybindings/keybindingStore.test.ts
@@ -408,4 +408,146 @@ describe('useKeybindingStore', () => {
       defaultKeybinding
     )
   })
+
+  describe('removeAllKeybindingsForCommand', () => {
+    it('should return false when command has no bindings', () => {
+      const store = useKeybindingStore()
+      expect(store.removeAllKeybindingsForCommand('nonexistent.command')).toBe(
+        false
+      )
+    })
+
+    it('should remove all bindings for a command with multiple bindings', () => {
+      const store = useKeybindingStore()
+      const binding1 = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'A', ctrl: true }
+      })
+      const binding2 = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'B', ctrl: true }
+      })
+
+      store.addDefaultKeybinding(binding1)
+      store.addUserKeybinding(binding2)
+      expect(store.getKeybindingsByCommandId('test.command')).toHaveLength(2)
+
+      const result = store.removeAllKeybindingsForCommand('test.command')
+
+      expect(result).toBe(true)
+      expect(store.getKeybindingsByCommandId('test.command')).toHaveLength(0)
+    })
+  })
+
+  describe('updateSpecificKeybinding', () => {
+    it('should replace a specific binding with a new one', () => {
+      const store = useKeybindingStore()
+      const binding1 = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'A', ctrl: true }
+      })
+      const binding2 = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'B', ctrl: true }
+      })
+
+      store.addUserKeybinding(binding1)
+      store.addUserKeybinding(binding2)
+      expect(store.getKeybindingsByCommandId('test.command')).toHaveLength(2)
+
+      const newBinding = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'C', alt: true }
+      })
+      store.updateSpecificKeybinding(binding1, newBinding)
+
+      const bindings = store.getKeybindingsByCommandId('test.command')
+      expect(bindings).toHaveLength(2)
+      expect(bindings.some((b) => b.combo.equals(newBinding.combo))).toBe(true)
+      expect(bindings.some((b) => b.combo.equals(binding1.combo))).toBe(false)
+    })
+  })
+
+  describe('isCommandKeybindingModified (multi-binding)', () => {
+    it('should detect modification when binding count differs', () => {
+      const store = useKeybindingStore()
+      const defaultBinding = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'A', ctrl: true }
+      })
+      store.addDefaultKeybinding(defaultBinding)
+
+      const extraBinding = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'B', ctrl: true }
+      })
+      store.addUserKeybinding(extraBinding)
+
+      expect(store.isCommandKeybindingModified('test.command')).toBe(true)
+    })
+
+    it('should return false when multi-binding matches defaults', () => {
+      const store = useKeybindingStore()
+      const binding1 = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'A', ctrl: true }
+      })
+      const binding2 = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'B', ctrl: true }
+      })
+
+      store.addDefaultKeybinding(binding1)
+      store.addDefaultKeybinding(binding2)
+
+      expect(store.isCommandKeybindingModified('test.command')).toBe(false)
+    })
+  })
+
+  describe('resetKeybindingForCommand (multi-binding)', () => {
+    it('should restore all default bindings when user has modified multi-binding command', () => {
+      const store = useKeybindingStore()
+      const defaultBinding1 = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'Delete' }
+      })
+      const defaultBinding2 = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'Backspace' }
+      })
+
+      store.addDefaultKeybinding(defaultBinding1)
+      store.addDefaultKeybinding(defaultBinding2)
+      expect(store.getKeybindingsByCommandId('test.command')).toHaveLength(2)
+
+      store.unsetKeybinding(defaultBinding1)
+      expect(store.getKeybindingsByCommandId('test.command')).toHaveLength(1)
+
+      const result = store.resetKeybindingForCommand('test.command')
+
+      expect(result).toBe(true)
+      expect(store.getKeybindingsByCommandId('test.command')).toHaveLength(2)
+    })
+
+    it('should remove all user bindings when no defaults exist for multi-binding', () => {
+      const store = useKeybindingStore()
+      const userBinding1 = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'X', ctrl: true }
+      })
+      const userBinding2 = new KeybindingImpl({
+        commandId: 'test.command',
+        combo: { key: 'Y', ctrl: true }
+      })
+
+      store.addUserKeybinding(userBinding1)
+      store.addUserKeybinding(userBinding2)
+      expect(store.getKeybindingsByCommandId('test.command')).toHaveLength(2)
+
+      const result = store.resetKeybindingForCommand('test.command')
+
+      expect(result).toBe(true)
+      expect(store.getKeybindingsByCommandId('test.command')).toHaveLength(0)
+    })
+  })
 })
diff --git a/src/platform/keybindings/keybindingStore.ts b/src/platform/keybindings/keybindingStore.ts
index 84b0f271b1..3c4c0910ad 100644
--- a/src/platform/keybindings/keybindingStore.ts
+++ b/src/platform/keybindings/keybindingStore.ts
@@ -144,47 +144,70 @@ export const useKeybindingStore = defineStore('keybinding', () => {
     userUnsetKeybindings.value = {}
   }
 
-  function resetKeybindingForCommand(commandId: string): boolean {
-    const currentKeybinding = getKeybindingByCommandId(commandId)
-    const defaultKeybinding =
-      defaultKeybindingsByCommandId.value[commandId]?.[0]
+  function removeAllKeybindingsForCommand(commandId: string): boolean {
+    const currentBindings = getKeybindingsByCommandId(commandId)
+    if (currentBindings.length === 0) return false
+    for (const binding of currentBindings) {
+      unsetKeybinding(binding)
+    }
+    return true
+  }
 
-    if (!defaultKeybinding) {
-      if (currentKeybinding) {
-        unsetKeybinding(currentKeybinding)
+  function updateSpecificKeybinding(
+    oldBinding: KeybindingImpl,
+    newBinding: KeybindingImpl
+  ) {
+    unsetKeybinding(oldBinding)
+    addUserKeybinding(newBinding)
+  }
+
+  function resetKeybindingForCommand(commandId: string): boolean {
+    const currentBindings = getKeybindingsByCommandId(commandId)
+    const defaultBindings = defaultKeybindingsByCommandId.value[commandId] ?? []
+
+    if (defaultBindings.length === 0) {
+      if (currentBindings.length > 0) {
+        for (const binding of currentBindings) {
+          unsetKeybinding(binding)
+        }
         return true
       }
       return false
     }
 
-    if (currentKeybinding?.equals(defaultKeybinding)) {
+    if (!isCommandKeybindingModified(commandId)) {
       return false
     }
 
-    if (currentKeybinding) {
-      unsetKeybinding(currentKeybinding)
+    for (const binding of currentBindings) {
+      unsetKeybinding(binding)
     }
 
-    const serializedCombo = defaultKeybinding.combo.serialize()
-    if (
-      userUnsetKeybindings.value[serializedCombo]?.equals(defaultKeybinding)
-    ) {
-      delete userUnsetKeybindings.value[serializedCombo]
+    for (const defaultBinding of defaultBindings) {
+      const serializedCombo = defaultBinding.combo.serialize()
+      if (userUnsetKeybindings.value[serializedCombo]?.equals(defaultBinding)) {
+        delete userUnsetKeybindings.value[serializedCombo]
+      }
     }
 
     return true
   }
 
   function isCommandKeybindingModified(commandId: string): boolean {
-    const currentKeybinding: KeybindingImpl | undefined =
-      getKeybindingByCommandId(commandId)
-    const defaultKeybinding: KeybindingImpl | undefined =
-      defaultKeybindingsByCommandId.value[commandId]?.[0]
+    const currentBindings = getKeybindingsByCommandId(commandId)
+    const defaultBindings = defaultKeybindingsByCommandId.value[commandId] ?? []
 
-    return !(
-      (currentKeybinding === undefined && defaultKeybinding === undefined) ||
-      currentKeybinding?.equals(defaultKeybinding)
-    )
+    if (currentBindings.length !== defaultBindings.length) return true
+    if (currentBindings.length === 0) return false
+
+    const sortedCurrent = [...currentBindings]
+      .map((b) => b.combo.serialize())
+      .sort()
+    const sortedDefault = [...defaultBindings]
+      .map((b) => b.combo.serialize())
+      .sort()
+
+    return sortedCurrent.some((combo, i) => combo !== sortedDefault[i])
   }
 
   return {
@@ -200,6 +223,8 @@ export const useKeybindingStore = defineStore('keybinding', () => {
     updateKeybindingOnCommand,
     resetAllKeybindings,
     resetKeybindingForCommand,
-    isCommandKeybindingModified
+    isCommandKeybindingModified,
+    removeAllKeybindingsForCommand,
+    updateSpecificKeybinding
   }
 })