diff --git a/src/UI/Shared/Tooltip.js b/src/UI/Shared/Tooltip.js
index db71cdc7c..c19b369fb 100644
--- a/src/UI/Shared/Tooltip.js
+++ b/src/UI/Shared/Tooltip.js
@@ -19,6 +19,24 @@ Tooltip.prototype.getOptions = function(options) {
     return result;
 };
 
+var onElementRemoved = function(event) {
+    event.data.hide();
+};
+
+var origShow = Tooltip.prototype.show;
+Tooltip.prototype.show = function() {
+    origShow.call(this);
+
+    this.$element.on('remove', this, onElementRemoved);
+};
+
+var origHide = Tooltip.prototype.hide;
+Tooltip.prototype.hide = function() {
+    origHide.call(this);
+
+    this.$element.off('remove', onElementRemoved);
+};
+
 module.exports = {
     appInitializer : function() {