diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterInLineCommentHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterInLineCommentHandler.java
index ff2c801877e1..f09d79813653 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterInLineCommentHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterInLineCommentHandler.java
@@ -55,8 +55,12 @@ public class EnterInLineCommentHandler extends EnterHandlerDelegateAdapter {
             document.insertString(caretOffset, prefix);
             return Result.Default;
           } else {
+            int afterPrefix = offset + prefix.length();
+            if (afterPrefix < document.getTextLength() && text.charAt(afterPrefix) != ' ') {
+              document.insertString(afterPrefix, " ");
+              //caretAdvance.set(0);
+            }
             caretOffsetRef.set(offset);
-            caretAdvance.set(-prefix.length() - 1);
           }
           return Result.Default;
         }