diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtension.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtension.kt
index c2a8616ab69..de9b820ecba 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtension.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtension.kt
@@ -36,6 +36,7 @@ public class ConvertMemberToExtension : JetSelfTargetingRangeIntention<JetCallab
         val classBody = element.getParent() as? JetClassBody ?: return null
         if (classBody.getParent() !is JetClass) return null
         if (element.getReceiverTypeReference() != null) return null
+        if (element.hasModifier(JetTokens.OVERRIDE_KEYWORD)) return null
         when (element) {
             is JetProperty -> if (element.hasInitializer()) return null
             is JetSecondaryConstructor -> return null
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/override.kt b/idea/testData/intentions/declarations/convertMemberToExtension/override.kt
new file mode 100644
index 00000000000..6100317afb1
--- /dev/null
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/override.kt
@@ -0,0 +1,9 @@
+// IS_APPLICABLE: false
+trait I {
+    fun foo()
+}
+
+class C : I {
+    override fun <caret>foo() {
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index f2d6bf4cb85..39dc280de46 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -3921,6 +3921,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("override.kt")
+            public void testOverride() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/override.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("private.kt")
             public void testPrivate() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/private.kt");