diff --git a/idea/resources/inspectionDescriptions/SortModifiers.html b/idea/resources/inspectionDescriptions/SortModifiers.html
index fff0ff38728..bcac711ed47 100644
--- a/idea/resources/inspectionDescriptions/SortModifiers.html
+++ b/idea/resources/inspectionDescriptions/SortModifiers.html
@@ -1,5 +1,6 @@
 <html>
 <body>
-This inspection reports to sort the modifiers in canonical order
+This inspection reports modifiers which have a different order from the one recommended in the style guide,
+and offers to reorder them.
 </body>
 </html>
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 285dada3b19..5e7a77fc2e7 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -2703,12 +2703,13 @@
 
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SortModifiersInspection"
-                     displayName="Sort modifiers"
+                     displayName="Non-canonical modifier order"
                      groupPath="Kotlin"
                      groupName="Style issues"
                      enabledByDefault="true"
                      level="WEAK WARNING"
                      language="kotlin"
+                     cleanupTool="true"
     />
 
     <referenceImporter implementation="org.jetbrains.kotlin.idea.quickfix.KotlinReferenceImporter"/>
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/SortModifiersInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/SortModifiersInspection.kt
index efe640df6e0..2aac7e41c4e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/SortModifiersInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/SortModifiersInspection.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.KtVisitorVoid
 import org.jetbrains.kotlin.psi.addRemoveModifier.sortModifiers
 import org.jetbrains.kotlin.psi.psiUtil.allChildren
 
-class SortModifiersInspection : AbstractKotlinInspection() {
+class SortModifiersInspection : AbstractKotlinInspection(), CleanupLocalInspectionTool {
 
     override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor {
         return object : KtVisitorVoid() {
@@ -40,7 +40,7 @@ class SortModifiersInspection : AbstractKotlinInspection() {
                 if (modifiers == sortedModifiers) return
 
                 holder.registerProblem(list,
-                                       "Sort modifiers",
+                                       "Non-canonical modifiers order",
                                        ProblemHighlightType.WEAK_WARNING,
                                        SortModifiersFix(sortedModifiers)
                 )
