diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt
index 35dee715aae..53475869686 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt
@@ -267,7 +267,12 @@ class ConvertMemberToExtensionIntention : SelfTargetingRangeIntention<KtCallable
             }
         }
 
-        return processSingleDeclaration(element, allowExpected)
+        val classVisibility = element.containingClass()?.visibilityModifierType()
+        val (extension, bodyToSelect) = processSingleDeclaration(element, allowExpected)
+        if (classVisibility != null && extension.visibilityModifier() == null) {
+            extension.addModifier(classVisibility)
+        }
+        return extension to bodyToSelect
     }
 
     private fun newTypeParameterList(member: KtCallableDeclaration): KtTypeParameterList? {
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/privateInInternalClass.kt b/idea/testData/intentions/declarations/convertMemberToExtension/privateInInternalClass.kt
new file mode 100644
index 00000000000..36d7c337137
--- /dev/null
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/privateInInternalClass.kt
@@ -0,0 +1,3 @@
+internal class Foo {
+    private fun <caret>bar() {}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/privateInInternalClass.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/privateInInternalClass.kt.after
new file mode 100644
index 00000000000..09141981f29
--- /dev/null
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/privateInInternalClass.kt.after
@@ -0,0 +1,4 @@
+internal class Foo {
+}
+
+private fun Foo.bar() {}
\ No newline at end of file
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/publicInInternalClass.kt b/idea/testData/intentions/declarations/convertMemberToExtension/publicInInternalClass.kt
new file mode 100644
index 00000000000..fa86f0e8d21
--- /dev/null
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/publicInInternalClass.kt
@@ -0,0 +1,3 @@
+internal class Foo {
+    fun <caret>bar() {}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/publicInInternalClass.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/publicInInternalClass.kt.after
new file mode 100644
index 00000000000..91e5015f1f7
--- /dev/null
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/publicInInternalClass.kt.after
@@ -0,0 +1,4 @@
+internal class Foo {
+}
+
+internal fun Foo.bar() {}
\ No newline at end of file
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/publicInPrivateClass.kt b/idea/testData/intentions/declarations/convertMemberToExtension/publicInPrivateClass.kt
new file mode 100644
index 00000000000..ea8ff2a1e9f
--- /dev/null
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/publicInPrivateClass.kt
@@ -0,0 +1,3 @@
+private class Foo {
+    fun <caret>bar() {}
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/publicInPrivateClass.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/publicInPrivateClass.kt.after
new file mode 100644
index 00000000000..c149b7b25cf
--- /dev/null
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/publicInPrivateClass.kt.after
@@ -0,0 +1,4 @@
+private class Foo {
+}
+
+private fun Foo.bar() {}
\ 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 144ee5a05e9..82b8b65c238 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -8703,6 +8703,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 runTest("idea/testData/intentions/declarations/convertMemberToExtension/private.kt");
             }
 
+            @TestMetadata("privateInInternalClass.kt")
+            public void testPrivateInInternalClass() throws Exception {
+                runTest("idea/testData/intentions/declarations/convertMemberToExtension/privateInInternalClass.kt");
+            }
+
             @TestMetadata("protected.kt")
             public void testProtected() throws Exception {
                 runTest("idea/testData/intentions/declarations/convertMemberToExtension/protected.kt");
@@ -8713,6 +8718,16 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 runTest("idea/testData/intentions/declarations/convertMemberToExtension/public.kt");
             }
 
+            @TestMetadata("publicInInternalClass.kt")
+            public void testPublicInInternalClass() throws Exception {
+                runTest("idea/testData/intentions/declarations/convertMemberToExtension/publicInInternalClass.kt");
+            }
+
+            @TestMetadata("publicInPrivateClass.kt")
+            public void testPublicInPrivateClass() throws Exception {
+                runTest("idea/testData/intentions/declarations/convertMemberToExtension/publicInPrivateClass.kt");
+            }
+
             @TestMetadata("secondaryConstructor.kt")
             public void testSecondaryConstructor() throws Exception {
                 runTest("idea/testData/intentions/declarations/convertMemberToExtension/secondaryConstructor.kt");