diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.kt
index d1e902352474..b8e55134513c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.kt
@@ -39,6 +39,7 @@ import java.awt.event.ComponentListener
 import java.util.concurrent.atomic.AtomicReference
 import javax.swing.JDialog
 import javax.swing.JFrame
+import javax.swing.JOptionPane
 import javax.swing.JWindow
 
 private val LOG = logger<WindowManagerImpl>()
@@ -289,6 +290,9 @@ class WindowManagerImpl : WindowManagerEx(), PersistentStateComponentWithModific
         frameToReuse.set(releasedFrameHelper.frame)
         releasedFrameHelper.frame.doSetRootPane(null)
         releasedFrameHelper.frame.setFrameHelper(null)
+        if (JOptionPane.getRootFrame() === releasedFrameHelper.frame) {
+          JOptionPane.setRootFrame(null)
+        }
       }
     }