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 ab2ed99c76f9..0f064dc6565c 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
@@ -125,7 +125,8 @@ class ConfigurableEditor extends AbstractEditor implements AnActionListener, AWT
 
   @Override
   boolean apply() {
-    return setError(apply(myConfigurable));
+    // do not apply changes of a single configurable if it is not modified
+    return setError(apply(myApplyAction.isEnabled() ? myConfigurable : null));
   }
 
   void openLink(Configurable configurable) {