diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt
index c12316cf503..105b0da8606 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt
@@ -39,7 +39,7 @@ class KotlinSmartEnterHandler : SmartEnterProcessorWithFixers() {
             KotlinFunctionDeclarationBodyFixer(),
 
             KotlinPropertySetterParametersFixer(),
-            KotlinPropertySetterBodyFixer(),
+            KotlinPropertyAccessorBodyFixer(),
 
             KotlinTryBodyFixer(),
             KotlinCatchParameterFixer(),
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinPropertySetterBodyFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinPropertyAccessorBodyFixer.kt
similarity index 86%
rename from idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinPropertySetterBodyFixer.kt
rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinPropertyAccessorBodyFixer.kt
index 5972fc3a2bb..284bbe153ac 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinPropertySetterBodyFixer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinPropertyAccessorBodyFixer.kt
@@ -28,12 +28,10 @@ import org.jetbrains.kotlin.psi.KtPsiUtil
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 
-class KotlinPropertySetterBodyFixer : SmartEnterProcessorWithFixers.Fixer<KotlinSmartEnterHandler>() {
+class KotlinPropertyAccessorBodyFixer : SmartEnterProcessorWithFixers.Fixer<KotlinSmartEnterHandler>() {
     override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, psiElement: PsiElement) {
         if (psiElement !is KtPropertyAccessor) return
 
-        if (!psiElement.isSetter) return
-
         if (psiElement.bodyExpression != null || psiElement.equalsToken != null) return
 
         val parentDeclaration = psiElement.getStrictParentOfType<KtDeclaration>()
@@ -43,12 +41,17 @@ class KotlinPropertySetterBodyFixer : SmartEnterProcessorWithFixers.Fixer<Kotlin
             }
         }
 
-        //setter without parameter and body is valid
+        // accessor without parameter and body is valid
         if (psiElement.namePlaceholder.endOffset == psiElement.endOffset) return
 
         val doc = editor.document
         var endOffset = psiElement.range.end
 
+        if (psiElement.isGetter && psiElement.rightParenthesis == null) {
+            doc.insertString(endOffset, ")")
+            endOffset++
+        }
+
         if (psiElement.text?.last() == ';') {
             doc.deleteString(endOffset - 1, endOffset)
             endOffset--
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
index 4ced98137b2..7415c4eeb16 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
@@ -1127,6 +1127,77 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
             """
     )
 
+    fun testGetter1() = doFileTest(
+        """
+            var a: Int = 0
+                get<caret>
+        """
+        ,
+        """
+            var a: Int = 0
+                get
+            <caret>
+            """
+    )
+
+    fun testGetter2() = doFileTest(
+        """
+            var a: Int = 0
+                get(<caret>
+            """
+        ,
+        """
+            var a: Int = 0
+                get() {
+                    <caret>
+                }
+            """
+    )
+
+    fun testGetter3() = doFileTest(
+        """
+            var a: Int = 0
+                get(<caret>)
+            """
+        ,
+        """
+            var a: Int = 0
+                get() {
+                    <caret>
+                }
+            """
+    )
+
+    fun testGetter4() = doFileTest(
+        """
+            var a: Int = 0
+                get(<caret>) = 1
+            """
+        ,
+        """
+            var a: Int = 0
+                get() = 1
+            <caret>
+            """
+    )
+
+    fun testGetter5() = doFileTest(
+        """
+            var a: Int = 0
+                get(<caret>) {
+                    return 1
+                }
+            """
+        ,
+        """
+            var a: Int = 0
+                get() {
+                    <caret>
+                    return 1
+                }
+            """
+    )
+
     fun testTryBody() = doFunTest(
         """
             try<caret>