diff --git a/java/java-impl/src/com/intellij/javadoc/EnterInJavadocParamDescriptionHandler.java b/java/java-impl/src/com/intellij/javadoc/EnterInJavadocParamDescriptionHandler.java
index 75c962351837..438cc49ec4ad 100644
--- a/java/java-impl/src/com/intellij/javadoc/EnterInJavadocParamDescriptionHandler.java
+++ b/java/java-impl/src/com/intellij/javadoc/EnterInJavadocParamDescriptionHandler.java
@@ -39,6 +39,11 @@ public class EnterInJavadocParamDescriptionHandler extends EnterHandlerDelegateA
     }
 
     final LogicalPosition caretPosition = caretModel.getLogicalPosition();
+    final LogicalPosition nameEndPosition = pair.first.parameterNameEndPosition;
+    if (nameEndPosition.line == caretPosition.line && caretPosition.column <= nameEndPosition.column) {
+      return Result.Continue;
+    }
+    
     final int descriptionStartColumn = pair.first.parameterDescriptionStartPosition.column;
     final LogicalPosition desiredPosition = new LogicalPosition(caretPosition.line, descriptionStartColumn);
     final Document document = editor.getDocument();