--- a/devtools/client/debugger/src/components/App.js
+++ b/devtools/client/debugger/src/components/App.js
@@ -147,26 +147,31 @@ class App extends Component<Props, State
 
   onEscape = (_, e) => {
     const {
       activeSearch,
       closeActiveSearch,
       closeQuickOpen,
       quickOpenEnabled
     } = this.props;
+    const { shortcutsModalEnabled } = this.state;
 
     if (activeSearch) {
       e.preventDefault();
       closeActiveSearch();
     }
 
     if (quickOpenEnabled) {
       e.preventDefault();
       closeQuickOpen();
     }
+
+    if (shortcutsModalEnabled) {
+      this.toggleShortcutsModal();
+    }
   };
 
   onCommandSlash = () => {
     this.toggleShortcutsModal();
   };
 
   isHorizontal() {
     return this.props.orientation === "horizontal";