diff --git a/src/routes/_components/Tooltip.html b/src/routes/_components/Tooltip.html
index 6f466d29..c7920425 100644
--- a/src/routes/_components/Tooltip.html
+++ b/src/routes/_components/Tooltip.html
@@ -19,6 +19,7 @@
 >
   {tooltipText}
 </span>
+<Shortcut scope="global" key="Escape" on:pressed="dismiss()" />
 <style>
   .tooltip-button {
     border-bottom: 1px dotted;
@@ -45,6 +46,8 @@
 
 </style>
 <script>
+  import Shortcut from './shortcut/Shortcut.html'
+
   let counter = 0
 
   export default {
@@ -66,7 +69,13 @@
         if (e.keyCode === 32 || e.keyCode === 13) { // enter or space
           this.toggle(e)
         }
+      },
+      dismiss () {
+        this.set({ shown: false })
       }
+    },
+    components: {
+      Shortcut
     }
   }
 </script>