diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/PlainEnterProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/PlainEnterProcessor.java
index c8015687fac2..8947c9e6843c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/PlainEnterProcessor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/PlainEnterProcessor.java
@@ -192,16 +192,7 @@ public class PlainEnterProcessor implements EnterProcessor {
     EditorActionManager actionManager = EditorActionManager.getInstance();
     EditorActionHandler actionHandler = actionManager.getActionHandler(IdeActions.ACTION_EDITOR_MOVE_LINE_END);
     final DataContext dataContext = DataManager.getInstance().getDataContext(editor.getComponent());
-    if (dataContext == null) {
-      i = CharArrayUtil.shiftForwardUntil(whiteSpaceText, i, "\n");
-      if (i >= whiteSpaceText.length()) {
-        i = whiteSpaceText.length();
-      }
-      editor.getCaretModel().moveToOffset(i + textRange.getStartOffset());
-    }
-    else {
-      actionHandler.execute(editor, editor.getCaretModel().getCurrentCaret(), dataContext);
-    }
+    actionHandler.execute(editor, editor.getCaretModel().getCurrentCaret(), dataContext);
     return  true;
   }
 }