diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontConfigurable.java
index 2ebc48203cde..1bac5d01168f 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontConfigurable.java
@@ -80,6 +80,7 @@ public class AppEditorFontConfigurable implements SearchableConfigurable, NoScro
     AppEditorFontOptionsPanel optionsPanel = getFontPanel().getOptionsPanel();
     optionsPanel.updateWarning();
     optionsPanel.updateOptionsList();
+    getFontPanel().updatePreview();
   }
 
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontPanel.java b/platform/lang-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontPanel.java
index 942dcf811cd2..08eb68ce04d1 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/fonts/AppEditorFontPanel.java
@@ -20,6 +20,7 @@ import com.intellij.application.options.colors.FontEditorPreview;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
+import com.intellij.openapi.editor.colors.EditorFontCache;
 import com.intellij.openapi.editor.colors.impl.FontPreferencesImpl;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,12 +45,19 @@ public class AppEditorFontPanel implements Disposable {
       new ColorAndFontSettingsListener.Abstract() {
         @Override
         public void fontChanged() {
-          myPreview.updateView();
+          updatePreview();
         }
       }
     );
   }
 
+  public void updatePreview() {
+    if (myPreviewScheme instanceof EditorFontCache) {
+      ((EditorFontCache)myPreviewScheme).reset();
+    }
+    myPreview.updateView();
+  }
+
   @Override
   public void dispose() {
     myPreview.disposeUIResources();