diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
index e23738d67b27..bdc4b5368ee2 100644
--- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
@@ -400,9 +400,9 @@ public class ScopeTreeViewPanel extends JPanel implements Disposable {
 
   private void reload(@Nullable final DefaultMutableTreeNode rootToReload) {
     final DefaultTreeModel treeModel = (DefaultTreeModel)myTree.getModel();
-    if (rootToReload != null) {
+    if (rootToReload != null && rootToReload != treeModel.getRoot()) {
       final List<TreePath> treePaths = TreeUtil.collectExpandedPaths(myTree, new TreePath(rootToReload.getPath()));
-      ((DefaultTreeModel)myTree.getModel()).reload(rootToReload);
+      treeModel.reload(rootToReload);
       final TreePath path = new TreePath(rootToReload.getPath());
       final boolean wasCollapsed = myTree.isCollapsed(path);
       final Runnable runnable = new Runnable() {
diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java
index f3f06e769587..5e091640d84b 100644
--- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java
@@ -325,7 +325,7 @@ public class FileTreeModelBuilder {
         ((DirectoryNode)node).setCompactedDirNode((DirectoryNode)treeNode);
       }
     }
-    return parentNode;
+    return parentNode != null ? parentNode : myRoot;
   }
 
   @Nullable
@@ -389,7 +389,7 @@ public class FileTreeModelBuilder {
     if (!isMarked[0]) return null;
 
     getModuleDirNode(vFile, myFileIndex.getModuleForFile(vFile), null);
-    return rootToReload;
+    return rootToReload != null ? rootToReload : myRoot;
   }