diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java
index 0a8baa9e4183..4dbc201f88c4 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java
@@ -37,12 +37,14 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyFileBase;
 import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.GrListOrMap;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrSwitchStatement;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.branch.GrBreakStatement;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.branch.GrContinueStatement;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.branch.GrReturnStatement;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.branch.GrThrowStatement;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.clauses.GrCaseSection;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrAssignmentExpression;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrBinaryExpression;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrCommandArgumentList;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameterList;
@@ -191,6 +193,9 @@ public class GroovyBlock implements Block, GroovyElementTypes, ASTBlock {
     if (psiParent instanceof GrDocComment || psiParent instanceof GrDocTag) {
       return new ChildAttributes(Indent.getSpaceIndent(GroovyIndentProcessor.GDOC_COMMENT_INDENT), null);
     }
+    if (psiParent instanceof GrVariable || psiParent instanceof GrAssignmentExpression) {
+      return new ChildAttributes(Indent.getNormalIndent(), null);
+    }
     return new ChildAttributes(Indent.getNoneIndent(), null);
   }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy
index 0f17c6c10da2..a1c44654463a 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy
@@ -221,5 +221,20 @@ def c = { a ->
 
   }
 
+  public void testEnterAfterAssignmentInDeclaration() {
+    doTest """def greeting = <caret>
+""", """def greeting =
+  <caret>
+"""
+  }
+
+  public void testEnterInAssignment() {
+    doTest """greeting = <caret>
+""", """greeting =
+  <caret>
+"""
+
+  }
+
 }