diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaLineIndentProvider.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaLineIndentProvider.java
index 7c064707da63..e5df223d7360 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaLineIndentProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaLineIndentProvider.java
@@ -51,6 +51,7 @@ public class JavaLineIndentProvider extends JavaLikeLangLineIndentProvider {
     SYNTAX_MAP.put(JavaTokenType.IF_KEYWORD, IfKeyword);
     SYNTAX_MAP.put(JavaTokenType.ELSE_KEYWORD, ElseKeyword);
     SYNTAX_MAP.put(JavaTokenType.FOR_KEYWORD, ForKeyword);
+    SYNTAX_MAP.put(JavaTokenType.DO_KEYWORD, DoKeyword);
     SYNTAX_MAP.put(JavaTokenType.C_STYLE_COMMENT, BlockComment);
     SYNTAX_MAP.put(JavaDocTokenType.DOC_COMMENT_START, DocBlockStart);
     SYNTAX_MAP.put(JavaDocTokenType.DOC_COMMENT_END, DocBlockEnd);
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java
index a0008f525f4a..202d2ff31dea 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/lineIndent/JavaLikeLangLineIndentProvider.java
@@ -53,6 +53,7 @@ public abstract class JavaLikeLangLineIndentProvider implements LineIndentProvid
     ElseKeyword,
     IfKeyword,
     ForKeyword,
+    DoKeyword,
     BlockComment,
     DocBlockStart,
     DocBlockEnd,
@@ -135,7 +136,7 @@ public abstract class JavaLikeLangLineIndentProvider implements LineIndentProvid
       else if (getPosition(editor, offset).matchesRule(
         position -> position.before().isAt(Colon) && position.isAfterOnSameLine(SwitchCase, SwitchDefault)
       ) || getPosition(editor, offset).matchesRule(
-        position -> position.before().isAt(ElseKeyword)
+        position -> position.before().isAtAnyOf(ElseKeyword, DoKeyword) 
       )) {
         return myFactory.createIndentCalculator(NORMAL, IndentCalculator.LINE_BEFORE);
       }