diff --git a/platform/analysis-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java b/platform/analysis-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java
index 0cfcf5edade4..02a8d30f52a0 100644
--- a/platform/analysis-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java
+++ b/platform/analysis-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java
@@ -452,6 +452,9 @@ final class PsiUpdateImpl {
         offset = instance.injectedToHost(file, offset);
       }
       myCaretOffset = myCaretVirtualEnd = offset;
+      if (!mySelection.containsOffset(offset)) {
+        mySelection = TextRange.create(offset, offset);
+      }
     }
 
     @Override