diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java index 8a3ea46540bd..5d62dcfbd07c 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java @@ -81,7 +81,11 @@ public class UsageViewManagerImpl extends UsageViewManager { UsageView usageView = createUsageView(searchedFor, foundUsages, presentation, factory); addContent((UsageViewImpl)usageView, presentation); showToolWindow(true); - UIUtil.invokeLaterIfNeeded(((UsageViewImpl)usageView)::expandRoot); + UIUtil.invokeLaterIfNeeded(() -> { + if (!((UsageViewImpl)usageView).isDisposed()) { + ((UsageViewImpl)usageView).expandRoot(); + } + }); return usageView; }