From a13a1dbdc48a26e8ce99d0986a9ef5e798085107 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Fri, 3 Jul 2015 22:33:26 +0300
Subject: [PATCH] IDEA-138300 Settings dialog doesn't detect changes unless
 changing focus

---
 .../openapi/options/newEditor/ConfigurableEditor.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java
index 1dfdf1d9afcf..ab2ed99c76f9 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java
@@ -194,7 +194,9 @@ class ConfigurableEditor extends AbstractEditor implements AnActionListener, AWT
     Window editor = UIUtil.getWindow(this);
     if (editor != null) {
       Window popup = UIUtil.getWindow(component);
-      if (popup != null && editor == popup.getParent()) {
+      // light-weight popup is located on the layered pane of the same window
+      // heavy-weight popup opens new window with the corresponding parent
+      if (popup == editor || popup != null && editor == popup.getParent()) {
         if (popup instanceof JDialog) {
           JDialog dialog = (JDialog)popup;
           return Dialog.ModalityType.MODELESS == dialog.getModalityType();