diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java
index ea1f62d22d84..de3e88e4e6c1 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java
@@ -39,6 +39,7 @@ public class JavaFormatterInEditorTest extends LightPlatformCodeInsightTestCase
       "\n" +
       "class <caret>Test {\n" +
       "}",
+      
       "import static java.util.concurrent\n" +
       "        .atomic.AtomicInteger.*;\n" +
       "\n" +
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java
index cd4897fe0d50..248643e91cbb 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java
@@ -342,6 +342,7 @@ public class CodeFormatterFacade {
       if (!hasTabs) {
         if (Math.min(endLineOffset, endOffsetToUse) - startLineOffset > mySettings.RIGHT_MARGIN) {
           preferredWrapPosition = startLineOffset + mySettings.RIGHT_MARGIN - FormatConstants.RESERVED_LINE_WRAP_WIDTH_IN_COLUMNS;
+          wrapLine = true;
         }
       }
       else if (canOptimize) {