diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java
index 839ee4ce8d1..b4e1a4b900d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java
@@ -113,6 +113,11 @@ public class QuickFixRegistrar {
         QuickFixes.factories.put(ILLEGAL_MODIFIER, removeModifierFactory);
         QuickFixes.factories.put(REPEATED_MODIFIER, removeModifierFactory);
 
+        JetSingleIntentionActionFactory removeInnerModifierFactory =
+                RemoveModifierFix.createRemoveModifierFromListOwnerFactory(INNER_KEYWORD);
+        QuickFixes.factories.put(INNER_CLASS_IN_TRAIT, removeInnerModifierFactory);
+        QuickFixes.factories.put(INNER_CLASS_IN_OBJECT, removeInnerModifierFactory);
+
         JetSingleIntentionActionFactory changeToBackingFieldFactory = ChangeToBackingFieldFix.createFactory();
         QuickFixes.factories.put(INITIALIZATION_USING_BACKING_FIELD_CUSTOM_SETTER, changeToBackingFieldFactory);
         QuickFixes.factories.put(INITIALIZATION_USING_BACKING_FIELD_OPEN_SETTER, changeToBackingFieldFactory);
diff --git a/idea/testData/quickfix/modifiers/afterRemoveInnerForClassInTrait.kt b/idea/testData/quickfix/modifiers/afterRemoveInnerForClassInTrait.kt
new file mode 100644
index 00000000000..aab6a6c8405
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/afterRemoveInnerForClassInTrait.kt
@@ -0,0 +1,4 @@
+// "Remove 'inner' modifier" "true"
+trait A {
+    class B
+}
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveInnerForClassInTrait.kt b/idea/testData/quickfix/modifiers/beforeRemoveInnerForClassInTrait.kt
new file mode 100644
index 00000000000..1f020514943
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/beforeRemoveInnerForClassInTrait.kt
@@ -0,0 +1,4 @@
+// "Remove 'inner' modifier" "true"
+trait A {
+    inne<caret>r class B
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 4eab89693a8..0b61ca2b253 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -2825,6 +2825,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest(fileName);
         }
 
+        @TestMetadata("beforeRemoveInnerForClassInTrait.kt")
+        public void testRemoveInnerForClassInTrait() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveInnerForClassInTrait.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("beforeRemoveRedundantModifier1.kt")
         public void testRemoveRedundantModifier1() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier1.kt");