diff --git a/src/components/Hoverable/index.js b/src/components/Hoverable/index.js
index d67c4b883a4d..f06ed5602744 100644
--- a/src/components/Hoverable/index.js
+++ b/src/components/Hoverable/index.js
@@ -72,7 +72,11 @@ class Hoverable extends Component {
         if (!this.state.isHovered) {
             return;
         }
-        if (this.wrapperView && !this.wrapperView.contains(event.target) && this.props.resetsOnClickOutside) {
+        if (this.props.resetsOnClickOutside) {
+            this.setIsHovered(false);
+            return;
+        }
+        if (this.wrapperView && !this.wrapperView.contains(event.target)) {
             this.setIsHovered(false);
         }
     }
diff --git a/src/components/Tooltip/index.js b/src/components/Tooltip/index.js
index af46f8154d00..8d3a345492ac 100644
--- a/src/components/Tooltip/index.js
+++ b/src/components/Tooltip/index.js
@@ -189,6 +189,7 @@ class Tooltip extends PureComponent {
                     containerStyles={this.props.containerStyles}
                     onHoverIn={this.showTooltip}
                     onHoverOut={this.hideTooltip}
+                    resetsOnClickOutside
                 >
                     {child}
                 </Hoverable>