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 ad88b852ea0f..c9b813cc3590 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java +++ b/platform/platform-impl/src/com/intellij/util/ui/OwnerOptional.java @@ -83,7 +83,9 @@ public class OwnerOptional { } public OwnerOptional ifNull(Consumer consumer) { - consumer.consume((Frame)this.myPermanentOwner); + if (myPermanentOwner == null) { + consumer.consume(null); + } return this; }