diff --git a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
index 9bfa5c2e7ce7..a3a7541ea8ce 100644
--- a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
+++ b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
@@ -171,6 +171,9 @@ public class UISettings extends SimpleModificationTracker implements PersistentS
    */
   public void fireUISettingsChanged() {
     incModificationCount();
+    if (myCounter == 1) {
+      return;
+    }
 
     if (ourSettings == this) {
       // if this is the main UISettings instance push event to bus and to all current components