diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java
index 039b9145afa4..1ce4baf130ec 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java
@@ -92,62 +92,51 @@ public class ClsModifierListImpl extends ClsRepositoryPsiElement<PsiModifierList
       appendText(annotations[i], indentLevel, buffer, separateAnnotations ? NEXT_LINE : " ");
     }
 
-    //TODO : filtering & ordering modifiers can go to CodeStyleManager
     final boolean isClass = parent instanceof PsiClass;
     final boolean isInterface = isClass && ((PsiClass)parent).isInterface();
+    final boolean isEnum = isClass && ((PsiClass)parent).isEnum();
     final boolean isInterfaceClass = isClass && parent.getParent() instanceof PsiClass && ((PsiClass)parent.getParent()).isInterface();
     final boolean isMethod = parent instanceof PsiMethod;
     final boolean isInterfaceMethod = isMethod && parent.getParent() instanceof PsiClass && ((PsiClass)parent.getParent()).isInterface();
     final boolean isField = parent instanceof PsiField;
     final boolean isInterfaceField = isField && parent.getParent() instanceof PsiClass && ((PsiClass)parent.getParent()).isInterface();
+    final boolean isEnumConstant = parent instanceof PsiEnumConstant;
 
-    if (hasModifierProperty(PsiModifier.PUBLIC) && !isInterfaceMethod && !isInterfaceField && !isInterfaceClass) {
-      buffer.append(PsiModifier.PUBLIC);
-      buffer.append(' ');
+    if (hasModifierProperty(PsiModifier.PUBLIC) && !isInterfaceMethod && !isInterfaceField && !isInterfaceClass && !isEnumConstant) {
+      buffer.append(PsiModifier.PUBLIC).append(' ');
     }
     if (hasModifierProperty(PsiModifier.PROTECTED)) {
-      buffer.append(PsiModifier.PROTECTED);
-      buffer.append(' ');
+      buffer.append(PsiModifier.PROTECTED).append(' ');
     }
     if (hasModifierProperty(PsiModifier.PRIVATE)) {
-      buffer.append(PsiModifier.PRIVATE);
-      buffer.append(' ');
+      buffer.append(PsiModifier.PRIVATE).append(' ');
     }
-    if (hasModifierProperty(PsiModifier.STATIC) && !isInterfaceField) {
-      buffer.append(PsiModifier.STATIC);
-      buffer.append(' ');
+    if (hasModifierProperty(PsiModifier.STATIC) && !isInterfaceField && !isEnumConstant) {
+      buffer.append(PsiModifier.STATIC).append(' ');
     }
     if (hasModifierProperty(PsiModifier.ABSTRACT) && !isInterface && !isInterfaceMethod) {
-      buffer.append(PsiModifier.ABSTRACT);
-      buffer.append(' ');
+      buffer.append(PsiModifier.ABSTRACT).append(' ');
     }
-    if (hasModifierProperty(PsiModifier.FINAL) && !isInterfaceField) {
-      buffer.append(PsiModifier.FINAL);
-      buffer.append(' ');
+    if (hasModifierProperty(PsiModifier.FINAL) && !isEnum && !isInterfaceField && !isEnumConstant) {
+      buffer.append(PsiModifier.FINAL).append(' ');
     }
     if (hasModifierProperty(PsiModifier.NATIVE)) {
-      buffer.append(PsiModifier.NATIVE);
-      buffer.append(' ');
+      buffer.append(PsiModifier.NATIVE).append(' ');
     }
     if (hasModifierProperty(PsiModifier.SYNCHRONIZED)) {
-      buffer.append(PsiModifier.SYNCHRONIZED);
-      buffer.append(' ');
+      buffer.append(PsiModifier.SYNCHRONIZED).append(' ');
     }
     if (hasModifierProperty(PsiModifier.TRANSIENT)) {
-      buffer.append(PsiModifier.TRANSIENT);
-      buffer.append(' ');
+      buffer.append(PsiModifier.TRANSIENT).append(' ');
     }
     if (hasModifierProperty(PsiModifier.VOLATILE)) {
-      buffer.append(PsiModifier.VOLATILE);
-      buffer.append(' ');
+      buffer.append(PsiModifier.VOLATILE).append(' ');
     }
     if (hasModifierProperty(PsiModifier.STRICTFP)) {
-      buffer.append(PsiModifier.STRICTFP);
-      buffer.append(' ');
+      buffer.append(PsiModifier.STRICTFP).append(' ');
     }
     if (hasModifierProperty(PsiModifier.DEFAULT)) {
-      buffer.append(PsiModifier.DEFAULT);
-      buffer.append(' ');
+      buffer.append(PsiModifier.DEFAULT).append(' ');
     }
   }
 
diff --git a/java/java-tests/testData/psi/cls/mirror/EmptyEnum.txt b/java/java-tests/testData/psi/cls/mirror/EmptyEnum.txt
index 33ea56d549a1..808cc55b2079 100644
--- a/java/java-tests/testData/psi/cls/mirror/EmptyEnum.txt
+++ b/java/java-tests/testData/psi/cls/mirror/EmptyEnum.txt
@@ -4,7 +4,7 @@
 
 package pkg;
 
-final enum EmptyEnum {
+enum EmptyEnum {
     ;
 
     public static pkg.EmptyEnum[] values() { /* compiled code */ }
diff --git a/java/java-tests/testData/psi/cls/mirror/EnumWithFields.txt b/java/java-tests/testData/psi/cls/mirror/EnumWithFields.txt
index 46035f350a19..8823f103c25d 100644
--- a/java/java-tests/testData/psi/cls/mirror/EnumWithFields.txt
+++ b/java/java-tests/testData/psi/cls/mirror/EnumWithFields.txt
@@ -4,11 +4,11 @@
 
 package pkg;
 
-public final enum EnumWithFields {
-    public static final E1, public static final E2;
+public enum EnumWithFields {
+    E1, E2;
 
-    boolean f1;
-    boolean f2;
+    private boolean f1;
+    static boolean f2;
 
     public static pkg.EnumWithFields[] values() { /* compiled code */ }
 
diff --git a/java/java-tests/testData/psi/cls/mirror/SimpleEnum.txt b/java/java-tests/testData/psi/cls/mirror/SimpleEnum.txt
index e9a230c7accc..654770a05777 100644
--- a/java/java-tests/testData/psi/cls/mirror/SimpleEnum.txt
+++ b/java/java-tests/testData/psi/cls/mirror/SimpleEnum.txt
@@ -4,8 +4,8 @@
 
 package pkg;
 
-public final enum SimpleEnum {
-    public static final E1, public static final E2;
+public enum SimpleEnum {
+    E1, E2;
 
     public static pkg.SimpleEnum[] values() { /* compiled code */ }
 
diff --git a/java/java-tests/testData/psi/cls/mirror/pkg/EnumWithFields.class b/java/java-tests/testData/psi/cls/mirror/pkg/EnumWithFields.class
index 8c36cc7c2a78..08920ff15d56 100644
Binary files a/java/java-tests/testData/psi/cls/mirror/pkg/EnumWithFields.class and b/java/java-tests/testData/psi/cls/mirror/pkg/EnumWithFields.class differ
diff --git a/java/java-tests/testData/psi/cls/mirror/src/pkg/EnumWithFields.java b/java/java-tests/testData/psi/cls/mirror/src/pkg/EnumWithFields.java
index bb392f26a125..c21d1664f3ba 100644
--- a/java/java-tests/testData/psi/cls/mirror/src/pkg/EnumWithFields.java
+++ b/java/java-tests/testData/psi/cls/mirror/src/pkg/EnumWithFields.java
@@ -3,6 +3,6 @@ package pkg;
 public enum EnumWithFields {
   E1, E2;
 
-  boolean f1;
-  boolean f2;
+  private boolean f1;
+  static boolean f2;
 }
\ No newline at end of file