diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/AddSpaceInsertHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/AddSpaceInsertHandler.java
new file mode 100644
index 000000000000..d0e990654f3d
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/AddSpaceInsertHandler.java
@@ -0,0 +1,36 @@
+package com.intellij.codeInsight.completion;
+
+import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorModificationUtil;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDocumentManager;
+
+/**
+ * @author zolotov
+ */
+public class AddSpaceInsertHandler implements InsertHandler<LookupElement> {
+  public final static InsertHandler<LookupElement> INSTANCE = new AddSpaceInsertHandler();
+
+  public void handleInsert(InsertionContext context, LookupElement item) {
+    Editor editor = context.getEditor();
+    if (context.getCompletionChar() == ' ') return;
+    Project project = editor.getProject();
+    if (project != null) {
+      if (!isCharAtSpace(editor)) {
+        EditorModificationUtil.insertStringAtCaret(editor, " ");
+        PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument());
+      }
+      else {
+        editor.getCaretModel().moveToOffset(editor.getCaretModel().getOffset() + 1);
+      }
+    }
+  }
+
+  private static boolean isCharAtSpace(Editor editor) {
+    final int startOffset = editor.getCaretModel().getOffset();
+    final Document document = editor.getDocument();
+    return document.getTextLength() > startOffset && document.getCharsSequence().charAt(startOffset) == ' ';
+  }
+}