diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
index d297606b503..7973c05ed74 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
@@ -166,5 +166,6 @@ public class QuickFixes {
         factories.put(PARAMETER_NAME_CHANGED_ON_OVERRIDE, RenameParameterToMatchOverriddenMethodFix.createFactory());
 
         factories.put(OPEN_MODIFIER_IN_ENUM, RemoveModifierFix.createRemoveModifierFromListOwnerFactory(OPEN_KEYWORD));
+        factories.put(ILLEGAL_ENUM_ANNOTATION, RemoveModifierFix.createRemoveModifierFromListOwnerFactory(ENUM_KEYWORD));
     }
 }
diff --git a/idea/testData/quickfix/modifiers/afterIllegalEnumAnnotation1.kt b/idea/testData/quickfix/modifiers/afterIllegalEnumAnnotation1.kt
new file mode 100644
index 00000000000..3ad26aeeb53
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/afterIllegalEnumAnnotation1.kt
@@ -0,0 +1,3 @@
+// "Remove 'enum' modifier" "true"
+<caret>trait A {
+}
diff --git a/idea/testData/quickfix/modifiers/afterIllegalEnumAnnotation2.kt b/idea/testData/quickfix/modifiers/afterIllegalEnumAnnotation2.kt
new file mode 100644
index 00000000000..61e1d0f2560
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/afterIllegalEnumAnnotation2.kt
@@ -0,0 +1,4 @@
+// "Remove 'enum' modifier" "true"
+class A() {
+    <caret>fun foo() {}
+}
diff --git a/idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation1.kt b/idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation1.kt
new file mode 100644
index 00000000000..0abe3ab1ee9
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation1.kt
@@ -0,0 +1,3 @@
+// "Remove 'enum' modifier" "true"
+<caret>enum trait A {
+}
diff --git a/idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation2.kt b/idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation2.kt
new file mode 100644
index 00000000000..9cd6225ee20
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation2.kt
@@ -0,0 +1,4 @@
+// "Remove 'enum' modifier" "true"
+class A() {
+    <caret>enum fun foo() {}
+}
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
index 24517a142db..750effd8682 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
@@ -408,6 +408,16 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest("idea/testData/quickfix/modifiers/beforeFinalTrait.kt");
         }
         
+        @TestMetadata("beforeIllegalEnumAnnotation1.kt")
+        public void testIllegalEnumAnnotation1() throws Exception {
+            doTest("idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation1.kt");
+        }
+        
+        @TestMetadata("beforeIllegalEnumAnnotation2.kt")
+        public void testIllegalEnumAnnotation2() throws Exception {
+            doTest("idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation2.kt");
+        }
+        
         @TestMetadata("beforeOpenMemberInFinalClass1.kt")
         public void testOpenMemberInFinalClass1() throws Exception {
             doTest("idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass1.kt");