diff --git a/platform/core-api/src/com/intellij/openapi/util/SimpleModificationTracker.java b/platform/core-api/src/com/intellij/openapi/util/SimpleModificationTracker.java
index 91a933909066..f8b3461d8478 100644
--- a/platform/core-api/src/com/intellij/openapi/util/SimpleModificationTracker.java
+++ b/platform/core-api/src/com/intellij/openapi/util/SimpleModificationTracker.java
@@ -44,4 +44,8 @@ public class SimpleModificationTracker implements ModificationTracker {
   public void incModificationCount() {
     UPDATER.incrementAndGet(this);
   }
+
+  public long incAndGetModificationCount() {
+    return UPDATER.incrementAndGet(this);
+  }
 }
\ No newline at end of file
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 95321651f571..c0c7055eddf6 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
@@ -173,8 +173,7 @@ public class UISettings extends SimpleModificationTracker implements PersistentS
     ColorBlindnessSupport support = ColorBlindnessSupport.get(COLOR_BLINDNESS);
     IconLoader.setFilter(support == null ? null : support.getFilter());
 
-    incModificationCount();
-    if (myCounter == 1) {
+    if (incAndGetModificationCount() == 1) {
       return;
     }