diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java
index 0105032eba97..b983e8f46024 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/LoadingIcon.java
@@ -69,6 +69,7 @@ class LoadingIcon extends JBImageIcon {
     }
 
     public boolean imageUpdate(Image img, int flags, int x, int y, int w, int h) {
+      if (myNode instanceof RepositoryNode && !((RepositoryNode)myNode).isLoading()) return false;
       if ((flags & (FRAMEBITS | ALLBITS)) != 0) {
         TreeNode[] pathToRoot = myModel.getPathToRoot(myNode);
         if (pathToRoot != null) {
diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java
index 12236ed4aefe..6a31c1a123b7 100644
--- a/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java
+++ b/platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java
@@ -155,6 +155,7 @@ public class RepositoryNode extends CheckedTreeNode implements EditableTreeNode,
 
   public void stopLoading() {
     myLoading.set(false);
+    myLoadingIcon.setImageObserver(null);
   }
 
   public boolean isLoading() {