diff --git a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java
index ca0d41c73428..c554aae210f7 100644
--- a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java
+++ b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.*;
 import com.intellij.ui.components.JBList;
+import com.intellij.util.ArrayUtil;
 import com.intellij.util.ui.FormBuilder;
 import com.intellij.util.ui.GridBag;
 import com.intellij.util.ui.UIUtil;
@@ -33,6 +34,8 @@ import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import java.awt.*;
 import java.awt.event.MouseEvent;
+import java.util.Arrays;
+import java.util.Set;
 
 /**
  * @author Yura Cangea, dsl
@@ -92,21 +95,27 @@ public class CustomFileTypeEditor extends SettingsEditor<AbstractFileType> {
       mySupportParens.setSelected(table.isHasParens());
       mySupportEscapes.setSelected(table.isHasStringEscapes());
 
-      for (String s : table.getKeywords1()) {
+      for (String s : sorted(table.getKeywords1())) {
         myKeywordModels[0].addElement(s);
       }
-      for (String s : table.getKeywords2()) {
+      for (String s : sorted(table.getKeywords2())) {
         myKeywordModels[1].addElement(s);
       }
-      for (String s : table.getKeywords3()) {
+      for (String s : sorted(table.getKeywords3())) {
         myKeywordModels[2].addElement(s);
       }
-      for (String s : table.getKeywords4()) {
+      for (String s : sorted(table.getKeywords4())) {
         myKeywordModels[3].addElement(s);
       }
     }
   }
 
+  private static String[] sorted(Set<String> keywords) {
+    String[] strings = ArrayUtil.toStringArray(keywords);
+    Arrays.sort(strings);
+    return strings;
+  }
+
   @Override
   public void applyEditorTo(AbstractFileType type) throws ConfigurationException {
     if (myFileTypeName.getText().trim().length() == 0) {