diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt
index f319cad6d52..5521cfaf185 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt
@@ -56,7 +56,9 @@ class KotlinSmartEnterHandler: SmartEnterProcessorWithFixers() {
                 KotlinCatchBodyFixer(),
                 KotlinFinallyBodyFixer(),
 
-                KotlinLastLambdaParameterFixer()
+                KotlinLastLambdaParameterFixer(),
+
+                KotlinClassInitializerFixer()
         )
 
         addEnterProcessors(KotlinPlainEnterProcessor())
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinClassInitializerFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinClassInitializerFixer.kt
new file mode 100644
index 00000000000..b8e64f5d80b
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinClassInitializerFixer.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.editor.fixers
+
+import com.intellij.lang.SmartEnterProcessorWithFixers
+import com.intellij.openapi.editor.Editor
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler
+import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.psi.KtClassInitializer
+
+class KotlinClassInitializerFixer : SmartEnterProcessorWithFixers.Fixer<KotlinSmartEnterHandler>() {
+    override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, psiElement: PsiElement) {
+        if (psiElement !is KtClassInitializer) return
+
+        if (psiElement.openBraceNode == null) {
+            val offset = psiElement.node.findChildByType(KtTokens.INIT_KEYWORD)?.textRange?.endOffset ?: return
+            editor.document.insertString(offset, "{}")
+        }
+    }
+}
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 f83e2d3edd2..11d00b0718d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
@@ -1317,6 +1317,22 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
             """
     )
 
+    fun testClassInit() = doFileTest(
+            """
+            class Foo {
+                init<caret>
+            }
+            """
+            ,
+            """
+            class Foo {
+                init {
+                    <caret>
+                }
+            }
+            """
+    )
+
     fun doFunTest(before: String, after: String) {
         fun String.withFunContext(): String {
             val bodyText = "//----\n${this.trimIndent()}\n//----"