diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java index 7a695c256e03..d4e09947974a 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java @@ -459,7 +459,7 @@ public class AbstractPopup implements JBPopup { if (isDisposed()) return; final Runnable finalRunnable = myFinalRunnable; - final IdeFocusManager focusManager = IdeFocusManager.findInstanceByComponent(myOwner); + final IdeFocusManager focusManager = myOwner != null ? IdeFocusManager.findInstanceByComponent(myOwner) : IdeFocusManager.findInstance(); if (myPopup != null) { if (!canClose()) {