diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt
index 42a36d249b1..21b519c63cc 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt
@@ -16,12 +16,9 @@
 
 package org.jetbrains.jet.plugin.completion.handlers
 
-import com.google.common.collect.Sets
-import com.intellij.codeInsight.TailType
 import com.intellij.codeInsight.completion.InsertHandler
 import com.intellij.codeInsight.completion.InsertionContext
 import com.intellij.codeInsight.lookup.LookupElement
-import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.jet.lang.psi.JetFunction
 import org.jetbrains.jet.lang.psi.JetPsiUtil
@@ -54,7 +51,6 @@ public object KotlinKeywordInsertHandler : InsertHandler<LookupElement> {
         }
 
         // Add space after keyword
-        context.setAddCompletionChar(false)
-        TailType.SPACE.processTail(context.getEditor(), context.getTailOffset())
+        WithTailInsertHandler.spaceTail().postHandleInsert(context, item)
     }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/WithTailInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/WithTailInsertHandler.kt
index 3d67c73b931..1840e652f71 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/WithTailInsertHandler.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/WithTailInsertHandler.kt
@@ -90,5 +90,6 @@ class WithTailInsertHandler(val tailText: String,
         fun rparenthTail() = WithTailInsertHandler(")", spaceBefore = false, spaceAfter = false)
         fun elseTail() = WithTailInsertHandler("else", spaceBefore = true, spaceAfter = true)
         fun eqTail() = WithTailInsertHandler("=", spaceBefore = true, spaceAfter = true) /*TODO: use code style options*/
+        fun spaceTail() = WithTailInsertHandler(" ", spaceBefore = false, spaceAfter = false)
     }
 }