diff --git a/addon/components/docs-keyboard-shortcuts/component.js b/addon/components/docs-keyboard-shortcuts/component.js
index 1391ee125..9367efdea 100644
--- a/addon/components/docs-keyboard-shortcuts/component.js
+++ b/addon/components/docs-keyboard-shortcuts/component.js
@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import { on } from '@ember/object/evented';
-import { later } from "@ember/runloop";
+import { later } from '@ember/runloop';
 import layout from './template';
 import { EKMixin, keyUp } from 'ember-keyboard';
 import { inject as service } from '@ember/service';
@@ -55,6 +55,12 @@ export default Component.extend(EKMixin, {
     }
   }),
 
+  hideKeyboardShortcuts: on(keyUp('Escape'), function() {
+    if (!formElementHasFocus() && this.get('isShowingKeyboardShortcuts')) {
+      this.set('isShowingKeyboardShortcuts', false);
+    }
+  }),
+
   actions: {
     toggleKeyboardShortcuts() {
       this.toggleProperty('isShowingKeyboardShortcuts');
diff --git a/addon/components/docs-keyboard-shortcuts/template.hbs b/addon/components/docs-keyboard-shortcuts/template.hbs
index 239a79742..35b4b546c 100644
--- a/addon/components/docs-keyboard-shortcuts/template.hbs
+++ b/addon/components/docs-keyboard-shortcuts/template.hbs
@@ -49,6 +49,14 @@
               Bring up this help dialog
             </td>
           </tr>
+          <tr>
+            <td>
+              <code class='docs__keyboard-key'>esc</code>
+            </td>
+            <td>
+              Hide this help dialog
+            </td>
+          </tr>
 
           <tr>
             <th></th>