diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeState.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeState.java
index 92a40c8aa854..bebff8e81dfd 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeState.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeState.java
@@ -40,8 +40,9 @@ public class InspectionTreeState {
   public void restoreExpansionAndSelection(InspectionTree tree, InspectionTreeNode reloadedNode) {
     restoreExpansionStatus((InspectionTreeNode)tree.getModel().getRoot(), tree);
     if (mySelectionPath != null) {
-      if (reloadedNode == null || needRestore(reloadedNode))
-      mySelectionPath.restore(tree);
+      if (reloadedNode == null || needRestore(reloadedNode)) {
+        mySelectionPath.restore(tree);
+      }
     } else {
       TreeUtil.selectFirstNode(tree);
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixPreviewPanelFactory.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixPreviewPanelFactory.java
index 0c15fe135288..22f39b6b7de6 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixPreviewPanelFactory.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixPreviewPanelFactory.java
@@ -198,7 +198,7 @@ public class QuickFixPreviewPanelFactory {
     @Override
     public void treeLoaded() {
       ApplicationManager.getApplication().invokeLater(() -> {
-        if (myView.isValid()) {
+        if (!myView.isDisposed()) {
           myView.syncRightPanel();
         }
       });