diff --git a/packages/web/src/commands/CommandListener.svelte b/packages/web/src/commands/CommandListener.svelte
index 64ba4c5be..7ede0cbb7 100644
--- a/packages/web/src/commands/CommandListener.svelte
+++ b/packages/web/src/commands/CommandListener.svelte
@@ -2,15 +2,10 @@
   import { commandsCustomized, visibleCommandPalette } from '../stores';
   import { get } from 'svelte/store';
   import { runGroupCommand } from './runCommand';
-  import { isMac, resolveKeyText } from '../utility/common';
+  import { getKeyTextFromEvent, isMac, resolveKeyText } from '../utility/common';
 
   export function handleCommandKeyDown(e) {
-    let keyText = '';
-    if (e.ctrlKey) keyText += 'Ctrl+';
-    if (e.metaKey) keyText += 'Command+';
-    if (e.shiftKey) keyText += 'Shift+';
-    if (e.altKey) keyText += 'Alt+';
-    keyText += e.key;
+    const keyText = getKeyTextFromEvent(e);
 
     // console.log('keyText', keyText);
 
diff --git a/packages/web/src/modals/CloseTabModal.svelte b/packages/web/src/modals/CloseTabModal.svelte
index ef8de7380..d86451435 100644
--- a/packages/web/src/modals/CloseTabModal.svelte
+++ b/packages/web/src/modals/CloseTabModal.svelte
@@ -1,15 +1,28 @@
 <script lang="ts">
+  import { get } from 'svelte/store';
   import FormStyledButton from '../buttons/FormStyledButton.svelte';
 
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
+  import { getKeyTextFromEvent, resolveKeyText } from '../utility/common';
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal } from './modalTools';
+  import { commandsCustomized } from '../stores';
 
   export let tabs;
   export let onConfirm;
   export let onCancel;
+
+  function handleKeyDown(e) {
+    const commandsValue = get(commandsCustomized);
+
+    const command = commandsValue['tabs.closeTab'];
+    if (resolveKeyText(command.keyText).toLowerCase() == getKeyTextFromEvent(e).toLowerCase()) {
+      closeCurrentModal();
+      onConfirm();
+    }
+  }
 </script>
 
 <FormProvider>
@@ -45,3 +58,5 @@
     </svelte:fragment>
   </ModalBase>
 </FormProvider>
+
+<svelte:window on:keydown={handleKeyDown} />
diff --git a/packages/web/src/tabpanel/TabsPanel.svelte b/packages/web/src/tabpanel/TabsPanel.svelte
index 73a2144c3..74f4243eb 100644
--- a/packages/web/src/tabpanel/TabsPanel.svelte
+++ b/packages/web/src/tabpanel/TabsPanel.svelte
@@ -261,7 +261,7 @@
     id: 'tabs.closeTab',
     category: 'Tabs',
     name: _t('command.tabs.closeTab', { defaultMessage: 'Close tab' }),
-    keyText: isElectronAvailable() ? 'CtrlOrCommand+W' : 'CtrlOrCommand+Shift+W',
+    keyText: isElectronAvailable() ? 'CtrlOrCommand+W' : 'Alt+W',
     testEnabled: () => {
       const hasAnyOtherTab = getOpenedTabs().filter(x => !x.closedTime).length >= 1;
       const hasAnyModalOpen = getOpenedModals().length > 0;
diff --git a/packages/web/src/utility/common.ts b/packages/web/src/utility/common.ts
index db20bfc4e..f37ee4320 100644
--- a/packages/web/src/utility/common.ts
+++ b/packages/web/src/utility/common.ts
@@ -134,3 +134,13 @@ export async function switchCurrentDatabase(data) {
     currentDatabase.set(data);
   }
 }
+
+export function getKeyTextFromEvent(e) {
+  let keyText = '';
+  if (e.ctrlKey) keyText += 'Ctrl+';
+  if (e.metaKey) keyText += 'Command+';
+  if (e.shiftKey) keyText += 'Shift+';
+  if (e.altKey) keyText += 'Alt+';
+  keyText += e.key;
+  return keyText;
+}