diff --git a/src/js/Tooltips/TooltipContainer.js b/src/js/Tooltips/TooltipContainer.js
index 48147df229..94c3e710c2 100644
--- a/src/js/Tooltips/TooltipContainer.js
+++ b/src/js/Tooltips/TooltipContainer.js
@@ -79,6 +79,7 @@ export default class TooltipContainer extends PureComponent {
       target.removeEventListener('mouseover', this._showTooltip);
       target.removeEventListener('mouseleave', this._hideTooltip);
       target.removeEventListener('keyup', this._handleKeyUp);
+      target.removeEventListener('focusout', this._hideTooltip);
       target.removeEventListener('blur', this._hideTooltip);
     }
   };
@@ -101,6 +102,7 @@ export default class TooltipContainer extends PureComponent {
       target.addEventListener('mouseover', this._showTooltip);
       target.addEventListener('mouseleave', this._hideTooltip);
       target.addEventListener('keyup', this._handleKeyUp);
+      target.addEventListener('focusout', this._hideTooltip);
       target.addEventListener('blur', this._hideTooltip);
     }
   };