diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
index 268b5fa6c288..e743e6679599 100644
--- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
@@ -1228,6 +1228,7 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui, SwingConstants {
 
       add(myContent);
 
+      disposeCloseButton();
       myCloseRec = new CloseButton();
     }
 
@@ -1327,16 +1328,20 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui, SwingConstants {
       SwingUtilities.invokeLater(new Runnable() {
         @Override
         public void run() {
-          if (myCloseRec != null && myCloseRec.getParent() != null) {
-            Container parent = myCloseRec.getParent();
-            parent.remove(myCloseRec);
-            ((JComponent)parent).revalidate();
-            parent.repaint();
-          }
+          disposeCloseButton();
         }
       });
     }
 
+    private void disposeCloseButton() {
+      if (myCloseRec != null && myCloseRec.getParent() != null) {
+        Container parent = myCloseRec.getParent();
+        parent.remove(myCloseRec);
+        ((JComponent)parent).revalidate();
+        parent.repaint();
+      }
+    }
+
     public void setAlpha(float alpha) {
       myAlpha = alpha;
       paintImmediately(0, 0, getWidth(), getHeight());