diff --git a/packages/web/src/commands/CommandListener.svelte b/packages/web/src/commands/CommandListener.svelte
index 39ef89e4..54f58346 100644
--- a/packages/web/src/commands/CommandListener.svelte
+++ b/packages/web/src/commands/CommandListener.svelte
@@ -1,5 +1,5 @@
 <script lang="ts" context="module">
-  import { commands, visibleCommandPalette } from '../stores';
+  import { commandsCustomized, visibleCommandPalette } from '../stores';
   import { get } from 'svelte/store';
   import { runGroupCommand } from './runCommand';
 
@@ -12,7 +12,7 @@
 
     // console.log('keyText', keyText);
 
-    const commandsValue = get(commands);
+    const commandsValue = get(commandsCustomized);
     const commandsFiltered: any = Object.values(commandsValue).filter(
       (x: any) =>
         x.keyText &&
diff --git a/packages/web/src/commands/CommandPalette.svelte b/packages/web/src/commands/CommandPalette.svelte
index 9ac1f6d3..b5eda1b8 100644
--- a/packages/web/src/commands/CommandPalette.svelte
+++ b/packages/web/src/commands/CommandPalette.svelte
@@ -19,7 +19,7 @@
 
   import _ from 'lodash';
   import { onMount } from 'svelte';
-  import { commands, getVisibleCommandPalette, visibleCommandPalette } from '../stores';
+  import { commands, commandsCustomized, getVisibleCommandPalette, visibleCommandPalette } from '../stores';
   import clickOutside from '../utility/clickOutside';
   import keycodes from '../utility/keycodes';
   import registerCommand from './registerCommand';
@@ -40,7 +40,7 @@
   });
 
   $: sortedComands = _.sortBy(
-    Object.values($commands).filter(x => x.enabled),
+    Object.values($commandsCustomized).filter(x => x.enabled),
     'text'
   );
 
diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts
index fc3eea66..71f8b5f5 100644
--- a/packages/web/src/commands/stdCommands.ts
+++ b/packages/web/src/commands/stdCommands.ts
@@ -203,6 +203,20 @@ registerCommand({
     }),
 });
 
+registerCommand({
+  id: 'settings.commands',
+  category: 'Settings',
+  name: 'Keyboard shortcuts',
+  onClick: () => {
+    openNewTab({
+      title: 'Keyboard Shortcuts',
+      icon: 'icon keyboard',
+      tabComponent: 'CommandListTab',
+      props: {},
+    });
+  },
+});
+
 export function registerFileCommands({
   idPrefix,
   category,
diff --git a/packages/web/src/elements/TableControl.svelte b/packages/web/src/elements/TableControl.svelte
index a9691fc5..568823f2 100644
--- a/packages/web/src/elements/TableControl.svelte
+++ b/packages/web/src/elements/TableControl.svelte
@@ -6,24 +6,28 @@
     getProps?: any;
     formatter?: any;
     slot?: number;
+    isHighlighted?: Function;
   }
 </script>
 
 <script lang="ts">
   import _ from 'lodash';
 
-  import { compact } from 'lodash';
   import { onMount } from 'svelte';
   import keycodes from '../utility/keycodes';
+  import { createEventDispatcher } from 'svelte';
 
   export let columns: TableControlColumn[];
   export let rows;
   export let focusOnCreate = false;
   export let selectable = false;
   export let selectedIndex = 0;
+  export let clickable = false;
 
   export let domTable;
 
+  const dispatch = createEventDispatcher();
+
   $: columnList = _.compact(_.flatten(columns));
 
   onMount(() => {
@@ -58,15 +62,19 @@
     {#each rows as row, index}
       <tr
         class:selected={selectable && selectedIndex == index}
+        class:clickable
         on:click={() => {
           if (selectable) {
             selectedIndex = index;
             domTable.focus();
           }
+          if (clickable) {
+            dispatch('clickrow', row);
+          }
         }}
       >
         {#each columnList as col}
-          <td>
+          <td class:isHighlighted={col.isHighlighted && col.isHighlighted(row)}>
             {#if col.component}
               <svelte:component this={col.component} {...col.getProps(row)} />
             {:else if col.formatter}
@@ -106,6 +114,9 @@
   tbody tr.selected {
     background: var(--theme-bg-selected);
   }
+  tbody tr.clickable:hover {
+    background: var(--theme-bg-hover);
+  }
   thead td {
     border: 1px solid var(--theme-border);
     background-color: var(--theme-bg-1);
@@ -115,4 +126,8 @@
     border: 1px solid var(--theme-border);
     padding: 5px;
   }
+
+  td.isHighlighted {
+    background-color: var(--theme-bg-1);
+  }
 </style>
diff --git a/packages/web/src/icons/FontIcon.svelte b/packages/web/src/icons/FontIcon.svelte
index 15b46bd0..4178e042 100644
--- a/packages/web/src/icons/FontIcon.svelte
+++ b/packages/web/src/icons/FontIcon.svelte
@@ -17,6 +17,7 @@
     'icon connection': 'mdi mdi-connection',
     'icon cell-data': 'mdi mdi-details',
     'icon sql-generator': 'mdi mdi-cog-transfer',
+    'icon keyboard': 'mdi mdi-keyboard-settings',
 
     'icon database': 'mdi mdi-database',
     'icon server': 'mdi mdi-server',
diff --git a/packages/web/src/modals/CommandModal.svelte b/packages/web/src/modals/CommandModal.svelte
new file mode 100644
index 00000000..2f897a63
--- /dev/null
+++ b/packages/web/src/modals/CommandModal.svelte
@@ -0,0 +1,49 @@
+<script lang="ts">
+  import _ from 'lodash';
+
+  import FormStyledButton from '../elements/FormStyledButton.svelte';
+
+  import FormProvider from '../forms/FormProvider.svelte';
+  import FormSubmit from '../forms/FormSubmit.svelte';
+  import FormTextField from '../forms/FormTextField.svelte';
+  import { customKeyboardShortcuts } from '../stores';
+  import ModalBase from './ModalBase.svelte';
+  import { closeCurrentModal } from './modalTools';
+
+  export let command;
+</script>
+
+<FormProvider initialValues={command}>
+  <ModalBase {...$$restProps}>
+    <svelte:fragment slot="header">Configure commmand</svelte:fragment>
+
+    <FormTextField label="Category" name="category" disabled />
+    <FormTextField label="Name" name="name" disabled />
+    <FormTextField label="Keyboard shortcut" name="keyText" />
+
+    <svelte:fragment slot="footer">
+      <FormSubmit
+        value="OK"
+        on:click={e => {
+          closeCurrentModal();
+          customKeyboardShortcuts.update(list => ({
+            ...list,
+            [command.id]: {
+              keyText: e.detail.keyText,
+              customKeyboardShortcut: true,
+            },
+          }));
+        }}
+      />
+      <FormStyledButton
+        type="button"
+        value="Reset"
+        on:click={() => {
+          closeCurrentModal();
+          customKeyboardShortcuts.update(list => _.omit(list, [command.id]));
+        }}
+      />
+      <FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
+    </svelte:fragment>
+  </ModalBase>
+</FormProvider>
diff --git a/packages/web/src/modals/DropDownMenu.svelte b/packages/web/src/modals/DropDownMenu.svelte
index 22b4ea76..982ae692 100644
--- a/packages/web/src/modals/DropDownMenu.svelte
+++ b/packages/web/src/modals/DropDownMenu.svelte
@@ -48,7 +48,7 @@
   import clickOutside from '../utility/clickOutside';
   import { createEventDispatcher } from 'svelte';
   import { onMount } from 'svelte';
-  import { commands } from '../stores';
+  import { commands, commandsCustomized } from '../stores';
   import { extractMenuItems } from '../utility/contextMenu';
 
   export let items;
@@ -70,7 +70,7 @@
   });
 
   $: extracted = extractMenuItems(items);
-  $: compacted = _.compact(extracted.map(x => mapItem(x, $commands)));
+  $: compacted = _.compact(extracted.map(x => mapItem(x, $commandsCustomized)));
   $: filtered = compacted.filter(x => !x.disabled || !x.hideDisabled);
 </script>
 
diff --git a/packages/web/src/stores.ts b/packages/web/src/stores.ts
index b847936e..d2f8f6de 100644
--- a/packages/web/src/stores.ts
+++ b/packages/web/src/stores.ts
@@ -41,6 +41,16 @@ export const currentTheme = writableWithStorage('theme-light', 'currentTheme');
 export const activeTabId = derived([openedTabs], ([$openedTabs]) => $openedTabs.find(x => x.selected)?.tabid);
 export const activeTab = derived([openedTabs], ([$openedTabs]) => $openedTabs.find(x => x.selected));
 export const recentDatabases = writableWithStorage([], 'recentDatabases');
+export const customKeyboardShortcuts = writableWithStorage({}, 'customKeyboardShortcuts');
+export const commandsCustomized = derived(
+  [commands, customKeyboardShortcuts],
+  ([$commands, $customKeyboardShortcuts]) =>
+    _.mapValues($commands, (v, k) => ({
+      // @ts-ignore
+      ...v,
+      ...$customKeyboardShortcuts[k],
+    }))
+);
 
 export const visibleToolbar = writableWithStorage(1, 'visibleToolbar');
 export const leftPanelWidth = writable(300);
diff --git a/packages/web/src/tabs/CommandListTab.svelte b/packages/web/src/tabs/CommandListTab.svelte
new file mode 100644
index 00000000..046dd48b
--- /dev/null
+++ b/packages/web/src/tabs/CommandListTab.svelte
@@ -0,0 +1,35 @@
+<script lang="ts" context="module">
+  export const matchingProps = [];
+</script>
+
+<script lang="ts">
+  import _ from 'lodash';
+
+  import TableControl from '../elements/TableControl.svelte';
+  import CommandModal from '../modals/CommandModal.svelte';
+  import { showModal } from '../modals/modalTools';
+  import { commandsCustomized } from '../stores';
+
+  $: commandList = _.sortBy(_.values($commandsCustomized), ['category', 'name']);
+</script>
+
+<div class="wrapper">
+  <TableControl
+    clickable
+    rows={commandList}
+    columns={[
+      { header: 'Category', fieldName: 'category' },
+      { header: 'Name', fieldName: 'name' },
+      { header: 'Keyboard shortcut', fieldName: 'keyText', isHighlighted: row => row.customKeyboardShortcut },
+      { header: 'commandId', fieldName: 'id' },
+    ]}
+    on:clickrow={e => showModal(CommandModal, { command: e.detail })}
+  />
+</div>
+
+<style>
+  .wrapper {
+    overflow: auto;
+    flex: 1;
+  }
+</style>
diff --git a/packages/web/src/tabs/index.js b/packages/web/src/tabs/index.js
index 89e920a1..d9cc41ab 100644
--- a/packages/web/src/tabs/index.js
+++ b/packages/web/src/tabs/index.js
@@ -13,6 +13,7 @@ import * as MarkdownViewTab from './MarkdownViewTab.svelte';
 import * as MarkdownPreviewTab from './MarkdownPreviewTab.svelte';
 import * as FavoriteEditorTab from './FavoriteEditorTab.svelte';
 import * as QueryDesignTab from './QueryDesignTab.svelte';
+import * as CommandListTab from './CommandListTab.svelte';
 
 export default {
   TableDataTab,
@@ -30,4 +31,5 @@ export default {
   MarkdownPreviewTab,
   FavoriteEditorTab,
   QueryDesignTab,
+  CommandListTab,
 };
diff --git a/packages/web/src/utility/openNewTab.ts b/packages/web/src/utility/openNewTab.ts
index c4b45113..928afbb9 100644
--- a/packages/web/src/utility/openNewTab.ts
+++ b/packages/web/src/utility/openNewTab.ts
@@ -20,7 +20,6 @@ export default async function openNewTab(newTab, initialData = undefined, option
 
   let existing = null;
 
-
   const { savedFile, savedFolder, savedFilePath } = newTab.props || {};
   if (savedFile || savedFilePath) {
     existing = oldTabs.find(
diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte
index 1aceab4e..043ec6ed 100644
--- a/packages/web/src/widgets/ConnectionList.svelte
+++ b/packages/web/src/widgets/ConnectionList.svelte
@@ -8,7 +8,7 @@
   import AppObjectList from '../appobj/AppObjectList.svelte';
   import * as connectionAppObject from '../appobj/ConnectionAppObject.svelte';
   import SubDatabaseList from '../appobj/SubDatabaseList.svelte';
-  import { commands, openedConnections } from '../stores';
+  import { commands, commandsCustomized, openedConnections } from '../stores';
   import axiosInstance from '../utility/axiosInstance';
   import ToolbarButton from './ToolbarButton.svelte';
   import runCommand from '../commands/runCommand';
@@ -43,7 +43,7 @@
     isExpandable={data => $openedConnections.includes(data._id)}
     {filter}
   />
-  {#if $connections && $connections.length == 0 && $commands['new.connection']?.enabled}
+  {#if $connections && $connections.length == 0 && $commandsCustomized['new.connection']?.enabled}
     <ToolbarButton icon="icon new-connection" on:click={() => runCommand('new.connection')}>
       Add new connection
     </ToolbarButton>
diff --git a/packages/web/src/widgets/Toolbar.svelte b/packages/web/src/widgets/Toolbar.svelte
index a51e1f08..1b5c95d6 100644
--- a/packages/web/src/widgets/Toolbar.svelte
+++ b/packages/web/src/widgets/Toolbar.svelte
@@ -10,7 +10,7 @@
   import _ from 'lodash';
   import { openFavorite } from '../appobj/FavoriteFileAppObject.svelte';
   import runCommand from '../commands/runCommand';
-  import { commands } from '../stores';
+  import { commands, commandsCustomized } from '../stores';
   import getElectron from '../utility/getElectron';
   import { useFavorites } from '../utility/metadataLoaders';
   import ToolbarButton from './ToolbarButton.svelte';
@@ -20,7 +20,7 @@
   $: favorites = useFavorites();
 
   $: list = _.sortBy(
-    Object.values($commands).filter(x => (x.enabled || x.showDisabled) && x.toolbar && x.onClick),
+    Object.values($commandsCustomized).filter(x => (x.enabled || x.showDisabled) && x.toolbar && x.onClick),
     x => (x.toolbarOrder == null ? 100 : x.toolbarOrder)
   );
 </script>