diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockUtil.java
index 605597333f84..62d6e58824f5 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CodeBlockUtil.java
@@ -100,7 +100,7 @@ public class CodeBlockUtil {
     }
     else {
       final IndentGuideDescriptor guide = editor.getIndentsModel().getCaretIndentGuide();
-      if (guide != null) {
+      if (guide != null && guide.startLine != editor.getCaretModel().getLogicalPosition().line) {
         editor.getCaretModel().moveToLogicalPosition(new LogicalPosition(guide.startLine, guide.indentLevel));
       }
       else {