diff --git a/components/tooltip/Tooltip.js b/components/tooltip/Tooltip.js
index 717be8e0..1be8564e 100644
--- a/components/tooltip/Tooltip.js
+++ b/components/tooltip/Tooltip.js
@@ -217,6 +217,9 @@ const tooltipFactory = (options = {}) => {
       };
 
       handleMouseLeaveForChildren = () => {
+        if (this.timeout) {
+          clearTimeout(this.timeout);
+        }
         this.timeout = setTimeout(() => {
           this.deactivate();
         }, 300);
diff --git a/package.json b/package.json
index 9bb6380d..1003c134 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "react-toolbox",
   "description": "A set of React components implementing Google's Material Design specification with the power of CSS Modules.",
   "homepage": "http://www.react-toolbox.io",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "main": "./lib",
   "module": "./components",
   "author": {