diff --git a/idea/resources/intentionDescriptions/ConvertPropertyInitializerToGetterIntention/after.kt.template b/idea/resources/intentionDescriptions/ConvertPropertyInitializerToGetterIntention/after.kt.template
index a3d557e0442..57717f73075 100644
--- a/idea/resources/intentionDescriptions/ConvertPropertyInitializerToGetterIntention/after.kt.template
+++ b/idea/resources/intentionDescriptions/ConvertPropertyInitializerToGetterIntention/after.kt.template
@@ -1,4 +1,4 @@
 class A {
     val foo: Int
-        get() = 1
+        <spot>get() = 1</spot>
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyInitializerToGetterIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyInitializerToGetterIntention.kt
index 70c31289a2e..0051d847b83 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyInitializerToGetterIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyInitializerToGetterIntention.kt
@@ -33,7 +33,6 @@ class ConvertPropertyInitializerToGetterIntention : SelfTargetingIntention<KtPro
                && element.getter == null
                && !element.isExtensionDeclaration()
                && !element.isLocal
-               && !element.isTopLevel
     }
 
     override fun applyTo(property: KtProperty, editor: Editor) {
diff --git a/idea/testData/intentions/convertPropertyInitializerToGetter/inapplicableIfTopLevelDeclaration.kt b/idea/testData/intentions/convertPropertyInitializerToGetter/inapplicableIfTopLevelDeclaration.kt
deleted file mode 100644
index 8947ef4836c..00000000000
--- a/idea/testData/intentions/convertPropertyInitializerToGetter/inapplicableIfTopLevelDeclaration.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-// IS_APPLICABLE: false
-
-val x: Int = 1<caret>
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt
index df00fd41501..41d153e5167 100644
--- a/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt
@@ -1,4 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// ACTION: Convert property initializer to getter
 // ACTION: Create class 'SomeTest'
 // ERROR: Unresolved reference: SomeTest
 
diff --git a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt
index 29a618e388b..53540f7f648 100644
--- a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt
@@ -1,6 +1,7 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
 // ERROR: Unresolved reference: SomeTest
 // ERROR: Expression expected, but a package name found
+// ACTION: Convert property initializer to getter
 // ACTION: Create class 'SomeTest'
 // ACTION: Replace safe access expression with 'if' expression
 
diff --git a/idea/testData/quickfix/autoImports/noImportsForClassInExcludedPackage.before.Main.kt b/idea/testData/quickfix/autoImports/noImportsForClassInExcludedPackage.before.Main.kt
index 937fd51493c..0117a8cdc4e 100644
--- a/idea/testData/quickfix/autoImports/noImportsForClassInExcludedPackage.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportsForClassInExcludedPackage.before.Main.kt
@@ -1,4 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// ACTION: Convert property initializer to getter
 // ACTION: Create class 'SomeClass'
 // ACTION: Create function 'SomeClass'
 // ERROR: Unresolved reference: SomeClass
diff --git a/idea/testData/quickfix/autoImports/noImportsForExcludedClass.before.Main.kt b/idea/testData/quickfix/autoImports/noImportsForExcludedClass.before.Main.kt
index 54a86b8f32b..f8acfd55db0 100644
--- a/idea/testData/quickfix/autoImports/noImportsForExcludedClass.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportsForExcludedClass.before.Main.kt
@@ -1,4 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// ACTION: Convert property initializer to getter
 // ACTION: Create class 'ExcludedClass'
 // ACTION: Create function 'ExcludedClass'
 // ERROR: Unresolved reference: ExcludedClass
diff --git a/idea/testData/quickfix/autoImports/noImportsForFunctionInExcludedPackage.before.Main.kt b/idea/testData/quickfix/autoImports/noImportsForFunctionInExcludedPackage.before.Main.kt
index 795e4b70cdf..ef31b7b468a 100644
--- a/idea/testData/quickfix/autoImports/noImportsForFunctionInExcludedPackage.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportsForFunctionInExcludedPackage.before.Main.kt
@@ -1,4 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// ACTION: Convert property initializer to getter
 // ACTION: Create function 'someFunction'
 // ERROR: Unresolved reference: someFunction
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/onTopLevel.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/onTopLevel.kt
index aec94ab0364..c05a88f7cfb 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/onTopLevel.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/onTopLevel.kt
@@ -1,4 +1,5 @@
 // "Create local variable 'foo'" "false"
+// ACTION: Convert property initializer to getter
 // ACTION: Create property 'foo'
 // ERROR: Unresolved reference: foo
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerNoClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerNoClass.kt
index f000ac58d76..e548ed65713 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerNoClass.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerNoClass.kt
@@ -1,4 +1,5 @@
 // "Create parameter 'foo'" "false"
+// ACTION: Convert property initializer to getter
 // ACTION: Create property 'foo'
 // ERROR: Unresolved reference: foo
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 22d48f602f7..60833888b9d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -3739,12 +3739,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
-        @TestMetadata("inapplicableIfTopLevelDeclaration.kt")
-        public void testInapplicableIfTopLevelDeclaration() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyInitializerToGetter/inapplicableIfTopLevelDeclaration.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("propertyWithInitializerWithSetter.kt")
         public void testPropertyWithInitializerWithSetter() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyInitializerToGetter/propertyWithInitializerWithSetter.kt");