diff --git a/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java b/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java
index 62f94776688b..3836da904d92 100644
--- a/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java
+++ b/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java
@@ -208,11 +208,6 @@ public class AnalysisUIOptions implements PersistentStateComponent<AnalysisUIOpt
       myView = view;
     }
 
-    @Override
-    public void update(@NotNull AnActionEvent e) {
-      e.getPresentation().setEnabled(!myView.isUpdating());
-    }
-
     @Override
     public final void setSelected(AnActionEvent e, boolean state) {
       setSelected(state);
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
index 9df9c5f6d6a8..6195440daec1 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
@@ -243,7 +243,7 @@ public class DefaultInspectionToolPresentation implements ProblemDescriptionsPro
       }
       if (!isDisposed()) {
         ApplicationManager.getApplication().assertReadAccessAllowed();
-        synchronized (view.getTreeWriteLock()) {
+        synchronized (view.getTreeStructureUpdateLock()) {
           final InspectionNode toolNode;
           toolNode = myToolNode == null ?
                      view.addTool(myToolWrapper, HighlightDisplayLevel.find(getSeverity((RefElement)refElement)),
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
index 9ce02713c5f3..e185d97cb7fc 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
@@ -83,6 +83,7 @@ import java.awt.event.MouseEvent;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.intellij.codeInspection.ex.InspectionRVContentProvider.insertByIndex;
 
@@ -112,7 +113,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
   private final GlobalInspectionContextImpl myGlobalInspectionContext;
   private boolean myRerun;
   private volatile boolean myDisposed;
-  private boolean myUpdating;
+  private int myUpdatingRequestors; //accessed only in edt
 
   @NotNull
   private final InspectionRVContentProvider myProvider;
@@ -121,7 +122,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
   private EditorEx myPreviewEditor;
   private InspectionTreeLoadingProgressAware myLoadingProgressPreview;
 
-  private final Object myTreeWriteLock = new Object();
+  private final Object myTreeStructureUpdateLock = new Object();
 
   public InspectionResultsView(@NotNull GlobalInspectionContextImpl globalInspectionContext,
                                @NotNull InspectionRVContentProvider provider) {
@@ -562,7 +563,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
     myProvider.appendToolNodeContent(myGlobalInspectionContext, toolNode, parentNode, showStructure);
     InspectionToolPresentation presentation = myGlobalInspectionContext.getPresentation(toolWrapper);
     toolNode = presentation.createToolNode(myGlobalInspectionContext, toolNode, myProvider, parentNode, showStructure);
-    synchronized (myTreeWriteLock) {
+    synchronized (getTreeStructureUpdateLock()) {
       ((DefaultInspectionToolPresentation)presentation).setToolNode(toolNode);
     }
     registerActionShortcuts(presentation);
@@ -605,9 +606,14 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
 
   public void setUpdating(boolean isUpdating) {
     final Runnable update = () -> {
-      myUpdating = isUpdating;
-      myTree.setPaintBusy(isUpdating);
-      if (!isUpdating && myLoadingProgressPreview != null) {
+      if (isUpdating) {
+        myUpdatingRequestors++;
+      } else {
+        myUpdatingRequestors--;
+      }
+      boolean hasUpdatingRequestors = myUpdatingRequestors > 0;
+      myTree.setPaintBusy(hasUpdatingRequestors);
+      if (!hasUpdatingRequestors && myLoadingProgressPreview != null) {
         myLoadingProgressPreview.treeLoaded();
       }
     };
@@ -620,8 +626,8 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
     }
   }
 
-  public Object getTreeWriteLock() {
-    return myTreeWriteLock;
+  public Object getTreeStructureUpdateLock() {
+    return myTreeStructureUpdateLock;
   }
 
   public void buildTree() {
@@ -629,19 +635,21 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
     final Runnable buildAction = () -> {
       try {
         setUpdating(true);
-        InspectionProfile profile = myInspectionProfile;
-        boolean isGroupedBySeverity = myGlobalInspectionContext.getUIOptions().GROUP_BY_SEVERITY;
-        boolean singleInspectionRun = myGlobalInspectionContext.isSingleInspectionRun();
-        myGroups.clear();
-        final Map<String, Tools> tools = myGlobalInspectionContext.getTools();
-        for (Tools currentTools : tools.values()) {
-          InspectionToolWrapper defaultToolWrapper = currentTools.getDefaultState().getTool();
-          final HighlightDisplayKey key = HighlightDisplayKey.find(defaultToolWrapper.getShortName());
-          for (ScopeToolState state : myProvider.getTools(currentTools)) {
-            InspectionToolWrapper toolWrapper = state.getTool();
-            if (myProvider.checkReportedProblems(myGlobalInspectionContext, toolWrapper)) {
-              addTool(toolWrapper, ((InspectionProfileImpl)profile).getErrorLevel(key, state.getScope(myProject), myProject),
-                      isGroupedBySeverity, singleInspectionRun);
+        synchronized (getTreeStructureUpdateLock()) {
+          InspectionProfile profile = myInspectionProfile;
+          boolean isGroupedBySeverity = myGlobalInspectionContext.getUIOptions().GROUP_BY_SEVERITY;
+          boolean singleInspectionRun = myGlobalInspectionContext.isSingleInspectionRun();
+          myGroups.clear();
+          final Map<String, Tools> tools = myGlobalInspectionContext.getTools();
+          for (Tools currentTools : tools.values()) {
+            InspectionToolWrapper defaultToolWrapper = currentTools.getDefaultState().getTool();
+            final HighlightDisplayKey key = HighlightDisplayKey.find(defaultToolWrapper.getShortName());
+            for (ScopeToolState state : myProvider.getTools(currentTools)) {
+              InspectionToolWrapper toolWrapper = state.getTool();
+              if (myProvider.checkReportedProblems(myGlobalInspectionContext, toolWrapper)) {
+                addTool(toolWrapper, ((InspectionProfileImpl)profile).getErrorLevel(key, state.getScope(myProject), myProject),
+                        isGroupedBySeverity, singleInspectionRun);
+              }
             }
           }
         }
@@ -964,7 +972,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
   }
 
   public boolean isUpdating() {
-    return myUpdating;
+    return myUpdatingRequestors > 0;
   }
 
   public void updateRightPanelLoading() {