diff --git a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java
index d9c59ef2cd2a..6d54bbd8c815 100644
--- a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java
+++ b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java
@@ -280,6 +280,8 @@ public final class IdeTooltipManager implements Disposable, AWTEventListener {
           return true;
         }
       }.setToCenter(toCenter).setCalloutShift(shift).setPositionChangeShift(posChangeX, posChangeY).setLayer(Balloon.Layer.top);
+    } else if (myCurrentTooltip == tooltip) {
+      return;//Don't re-show the same custom tooltip on every mouse movement
     }
 
     show(tooltip, now);
diff --git a/platform/platform-impl/src/com/intellij/ui/TooltipWithClickableLinks.java b/platform/platform-impl/src/com/intellij/ui/TooltipWithClickableLinks.java
index bbbe06cf18f0..566eb5e70452 100644
--- a/platform/platform-impl/src/com/intellij/ui/TooltipWithClickableLinks.java
+++ b/platform/platform-impl/src/com/intellij/ui/TooltipWithClickableLinks.java
@@ -33,6 +33,7 @@ import java.awt.*;
 public class TooltipWithClickableLinks extends IdeTooltip {
   public TooltipWithClickableLinks(JComponent component, String htmlText, HyperlinkListener hyperlinkListener) {
     super(component, new Point(), createTipComponent(htmlText, hyperlinkListener), component, htmlText);
+    setHint(true);//Avoid hiding this kind of tooltips when mouse leaves component
   }
 
   private static JComponent createTipComponent(String text, HyperlinkListener hyperlinkListener) {