diff --git a/src/tooltip.jsx b/src/tooltip.jsx
index f7abfa679fcdbc..79ac41abfb2a6e 100644
--- a/src/tooltip.jsx
+++ b/src/tooltip.jsx
@@ -26,6 +26,10 @@ let Tooltip = React.createClass({
     this._setTooltipPosition();
   },
 
+  componentWillReceiveProps() {
+    this._setTooltipPosition();
+  },
+
   componentDidUpdate() {
     this._setRippleSize();
   },