Merge branch 'master' of ssh://git.eclipse.org/gitroot/orion/org.eclipse.orion.client
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/webui/tooltip.js b/bundles/org.eclipse.orion.client.core/web/orion/webui/tooltip.js
index 4a93bb4..e9b9ede 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/webui/tooltip.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/webui/tooltip.js
@@ -61,8 +61,6 @@
 						lib.stop(event);
 					}
 				}, false);
-				lib.addAutoDismiss([self._node], function() {self.hide(0);});
-
 			} else {
 				this._showDelay = options.showDelay || 1000;
 				var leave = ["mouseout", "click"];  //$NON-NLS-1$ //$NON-NLS-0$
@@ -96,6 +94,8 @@
 				}
 				this._tip.appendChild(this._tipInner);
 				document.body.appendChild(this._tip);
+				var self = this;
+				lib.addAutoDismiss([this._tip, this._node], function() {self.hide(0);});
 			}
 			return this._tip;
 		},