diff --git a/spec/tooltip-manager-spec.js b/spec/tooltip-manager-spec.js
index 0cf3c3e64..184f47bd3 100644
--- a/spec/tooltip-manager-spec.js
+++ b/spec/tooltip-manager-spec.js
@@ -218,7 +218,9 @@ describe('TooltipManager', () => {
         const disposable = manager.add(element, { title: 'Title' })
         hover(element, function () {
           expect(document.body.querySelector('.tooltip')).not.toBeNull()
-          window.dispatchEvent(new CustomEvent('keydown'))
+          window.dispatchEvent(new CustomEvent('keydown', {
+            bubbles: true
+          }))
           expect(document.body.querySelector('.tooltip')).toBeNull()
           disposable.dispose()
         })
diff --git a/src/tooltip-manager.js b/src/tooltip-manager.js
index 07b4f196a..9779e78fc 100644
--- a/src/tooltip-manager.js
+++ b/src/tooltip-manager.js
@@ -153,11 +153,11 @@ class TooltipManager {
     }
 
     window.addEventListener('resize', hideTooltip)
-    window.addEventListener('keydown', hideTooltip)
+    window.addEventListener('keydown', hideTooltip, { capture: true })
 
     const disposable = new Disposable(() => {
       window.removeEventListener('resize', hideTooltip)
-      window.removeEventListener('keydown', hideTooltip)
+      window.removeEventListener('keydown', hideTooltip, { capture: true })
       hideTooltip()
       tooltip.destroy()