diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
index ae48e17848d2..87aa680dc876 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
@@ -579,8 +579,10 @@ public class DaemonListeners implements Disposable {
           int offset = editor.logicalPositionToOffset(logical);
           if (editor.offsetToLogicalPosition(offset).column != logical.column) return; // we are in virtual space
           HighlightInfo info = myDaemonCodeAnalyzer.findHighlightByOffset(editor.getDocument(), offset, false);
-          if (info == null || info.getDescription() == null) return;
-          if (IdeTooltipManager.getInstance().hasCurrent()) return;
+          if (info == null || info.getDescription() == null) {
+            IdeTooltipManager.getInstance().hideCurrent(e.getMouseEvent());
+            return;
+          }
           DaemonTooltipUtil.showInfoTooltip(info, editor, offset);
           shown = true;
         }
diff --git a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java
index fb862291d515..44dd5fd41ce4 100644
--- a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java
+++ b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java
@@ -132,9 +132,7 @@ public class IdeTooltipManager implements ApplicationComponent, AWTEventListener
     else if (me.getID() == MouseEvent.MOUSE_MOVED) {
       if (c == myCurrentComponent || c == myQueuedComponent) {
         if (myCurrentTipUi != null && myCurrentTipUi.wasFadedIn()) {
-          if (hideCurrent(me, null, null)) {
-            maybeShowFor(c, me);
-          }
+          maybeShowFor(c, me);
         }
         else {
           if (!myCurrentTipIsCentered) {