diff --git a/src/KeyBindingsDefaults.ts b/src/KeyBindingsDefaults.ts
index 76d55b42d3..e122b2dff8 100644
--- a/src/KeyBindingsDefaults.ts
+++ b/src/KeyBindingsDefaults.ts
@@ -30,9 +30,7 @@ import {
     KeyBindingAction,
 } from "./accessibility/KeyboardShortcuts";
 
-export const getBindingsByCategory = (
-    category: CategoryName,
-): KeyBinding[] => {
+export const getBindingsByCategory = (category: CategoryName): KeyBinding[] => {
     return CATEGORIES[category].settingNames.reduce((bindings, name) => {
         const value = getCustomizableShortcuts()[name]?.default;
         if (value) {
@@ -151,7 +149,16 @@ const roomBindings = (): KeyBinding[] => {
 };
 
 const navigationBindings = (): KeyBinding[] => {
-    return getBindingsByCategory(CategoryName.NAVIGATION);
+    const bindings = getBindingsByCategory(CategoryName.NAVIGATION);
+
+    bindings.push({
+        action: "KeyBinding.closeDialogOrContextMenu" as KeyBindingAction,
+        keyCombo: {
+            key: Key.ESCAPE,
+        },
+    });
+
+    return bindings;
 };
 
 const labsBindings = (): KeyBinding[] => {