diff --git a/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java b/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java index c9b813cc3590..5334ab8c733c 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java +++ b/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java @@ -31,7 +31,8 @@ import java.awt.*; public class OwnerOptional { @NotNull - private static Window findOwnerByComponent(@NotNull Component component) { + private static Window findOwnerByComponent(Component component) { + if (component == null) component = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow(); return (component instanceof Window) ? (Window) component : SwingUtilities.getWindowAncestor(component); }