diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java index c9f1f5c6ef0e..b5eca8b1f0e4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java @@ -220,11 +220,11 @@ public class GlassPaneDialogWrapperPeer extends DialogWrapperPeer implements Foc } public boolean isVisible() { - return myDialog.isVisible(); + return myDialog != null && myDialog.isVisible(); } public boolean isShowing() { - return myDialog.isShowing(); + return myDialog != null && myDialog.isShowing(); } public void setSize(final int width, final int height) {