diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassInitializer.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassInitializer.java
index 82c219a795a..6fe6ff0ec73 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassInitializer.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassInitializer.java
@@ -58,6 +58,11 @@ public class JetClassInitializer extends JetDeclarationStub<KotlinPlaceHolderStu
     }
 
     public boolean hasInitKeyword() {
-        return findChildByType(JetTokens.INIT_KEYWORD) != null;
+        return getInitKeyword() != null;
+    }
+
+    @Nullable
+    public PsiElement getInitKeyword() {
+        return findChildByType(JetTokens.INIT_KEYWORD);
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt
index 1410bdacc63..bc9461ab760 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt
@@ -230,9 +230,11 @@ public class JetPsiFactory(private val project: Project) {
     }
 
     public fun createAnonymousInitializer(): JetClassInitializer {
-        return createClass("class A { {} }").getAnonymousInitializers().first()
+        return createClass("class A { init {} }").getAnonymousInitializers().first()
     }
 
+    public fun createInitKeyword(): PsiElement = createAnonymousInitializer().getInitKeyword()!!
+
     public fun createEmptyClassBody(): JetClassBody {
         return createClass("class A(){}").getBody()!!
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
index b5a6985bb2f..8c26bea382d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
@@ -408,6 +408,14 @@ public fun PsiElement.prevLeafSkipWhitespacesAndComments(): PsiElement? {
     return leaf
 }
 
+public fun PsiElement.prevLeafSkipWhitespaces(): PsiElement? {
+    var leaf = prevLeaf()
+    while (leaf is PsiWhiteSpace) {
+        leaf = leaf!!.prevLeaf()
+    }
+    return leaf
+}
+
 public fun PsiElement.nextLeafSkipWhitespacesAndComments(): PsiElement? {
     var leaf = nextLeaf()
     while (leaf is PsiWhiteSpace || leaf is PsiComment) {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties
index 1da5dda86b8..206e8c42e73 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties
@@ -13,6 +13,7 @@ make.element.modifier=Make {0} {1}
 add.modifier=Add ''{0}'' modifier
 add.modifier.family=Add Modifier
 add.init.keyword=Add 'init' keyword
+add.init.keyword.family=Add 'init' keyword
 make.element.in.classifiers.open=Make ''{0}'' in {1} open
 make.class.annotation.class=Make ''{0}'' an annotation class
 make.class.annotation.class.family=Make Class an Annotation Class
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInitKeywordFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInitKeywordFix.kt
index 34a96cc3ab7..33d22bf0cbb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInitKeywordFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInitKeywordFix.kt
@@ -24,30 +24,34 @@ import org.jetbrains.kotlin.idea.*
 import com.intellij.openapi.project.*
 import com.intellij.openapi.editor.*
 import com.intellij.psi.*
+import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.psi.psiUtil.*
 
 
 public class AddInitKeywordFix(element: JetClassInitializer) : JetIntentionAction<JetClassInitializer>(element) {
     override fun getText() = JetBundle.message("add.init.keyword")
 
-    override fun getFamilyName() = JetBundle.message("add.init.keyword")
+    override fun getFamilyName() = JetBundle.message("add.init.keyword.family")
 
     override fun invoke(project: Project, editor: Editor?, file: JetFile) {
-        val initializer = element.copy() as JetClassInitializer
-        val aClass = JetPsiFactory(file).createClass("""class A {
-                ${initializer.getModifierList()?.getText() ?: ""} init ${initializer.getBody().getText()}
-                }"""
-        )
-        val newInitializers = aClass.getAnonymousInitializers()
-        assert(newInitializers.size() == 1)
-        element.replace(newInitializers[0])
+        addInitKeyword(file, element)
     }
 
-    override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?): Boolean {
-        return super.isAvailable(project, editor, file)
-    }
+    class object Factory : JetSingleIntentionActionFactory() {
+        fun addInitKeyword(file: JetFile, element: JetClassInitializer) {
+            if (element.hasInitKeyword()) return
 
-    class object : JetSingleIntentionActionFactory() {
+            val psiFactory = JetPsiFactory(file)
+            val initKeyword = psiFactory.createInitKeyword()
+            val anchor = element.getBody()
+            element.addBefore(initKeyword, anchor)
+            element.addBefore(psiFactory.createWhiteSpace(), anchor)
+
+            val prevLeaf: PsiElement? = element.prevLeafSkipWhitespaces()
+            if (prevLeaf?.getNode()?.getElementType() == JetTokens.SEMICOLON) {
+                prevLeaf!!.delete()
+            }
+        }
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             return AddInitKeywordFix(diagnostic.getPsiElement().getNonStrictParentOfType<JetClassInitializer>() ?: return null)
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java
index 5fd725ce3ee..280f651fcf1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java
@@ -300,6 +300,6 @@ public class QuickFixRegistrar {
 
         QuickFixes.factories.put(DEPRECATED_CLASS_OBJECT_SYNTAX, ClassObjectToCompanionObjectFix.Factory);
         QuickFixes.factories.put(DEPRECATED_CLASS_OBJECT_SYNTAX, ClassObjectToCompanionObjectInWholeProjectFix.Factory);
-        QuickFixes.factories.put(INIT_KEYWORD_BEFORE_CLASS_INITIALIZER_EXPECTED, AddInitKeywordFix.OBJECT$);
+        QuickFixes.factories.put(INIT_KEYWORD_BEFORE_CLASS_INITIALIZER_EXPECTED, AddInitKeywordFix.Factory);
     }
 }
diff --git a/idea/testData/quickfix/modifiers/afterAddInitKeywordRemoveSemicolon.kt b/idea/testData/quickfix/modifiers/afterAddInitKeywordRemoveSemicolon.kt
new file mode 100644
index 00000000000..e9a3c91bd34
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/afterAddInitKeywordRemoveSemicolon.kt
@@ -0,0 +1,9 @@
+// "Add 'init' keyword" "true"
+fun foo() = 1
+class A {
+    val prop = foo()
+
+    init {
+
+    }
+}
diff --git a/idea/testData/quickfix/modifiers/afterAddInitKeywordRemoveSemicolonSameLine.kt b/idea/testData/quickfix/modifiers/afterAddInitKeywordRemoveSemicolonSameLine.kt
new file mode 100644
index 00000000000..e9a3c91bd34
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/afterAddInitKeywordRemoveSemicolonSameLine.kt
@@ -0,0 +1,9 @@
+// "Add 'init' keyword" "true"
+fun foo() = 1
+class A {
+    val prop = foo()
+
+    init {
+
+    }
+}
diff --git a/idea/testData/quickfix/modifiers/beforeAddInitKeywordRemoveSemicolon.kt b/idea/testData/quickfix/modifiers/beforeAddInitKeywordRemoveSemicolon.kt
new file mode 100644
index 00000000000..d8d9b260ea3
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/beforeAddInitKeywordRemoveSemicolon.kt
@@ -0,0 +1,9 @@
+// "Add 'init' keyword" "true"
+fun foo() = 1
+class A {
+    val prop = foo();
+
+    <caret>{
+
+    }
+}
diff --git a/idea/testData/quickfix/modifiers/beforeAddInitKeywordRemoveSemicolonSameLine.kt b/idea/testData/quickfix/modifiers/beforeAddInitKeywordRemoveSemicolonSameLine.kt
new file mode 100644
index 00000000000..0eb341e3a2c
--- /dev/null
+++ b/idea/testData/quickfix/modifiers/beforeAddInitKeywordRemoveSemicolonSameLine.kt
@@ -0,0 +1,8 @@
+// "Add 'init' keyword" "true"
+fun foo() = 1
+class A {
+    val prop = foo()
+    ;<caret>{
+
+    }
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 76b3986d043..23ddb779f60 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -2985,6 +2985,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest(fileName);
         }
 
+        @TestMetadata("beforeAddInitKeywordRemoveSemicolon.kt")
+        public void testAddInitKeywordRemoveSemicolon() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeAddInitKeywordRemoveSemicolon.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("beforeAddInitKeywordRemoveSemicolonSameLine.kt")
+        public void testAddInitKeywordRemoveSemicolonSameLine() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeAddInitKeywordRemoveSemicolonSameLine.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("beforeAddInitKeywordWithModifiers.kt")
         public void testAddInitKeywordWithModifiers() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeAddInitKeywordWithModifiers.kt");