diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
index 8bfcb777245d..183d0ac3dfdb 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
@@ -678,9 +678,9 @@ public class VariableInplaceRenamer {
   protected void revertState() {
     CommandProcessor.getInstance().executeCommand(myProject, new Runnable() {
       public void run() {
+        final Editor topLevelEditor = InjectedLanguageUtil.getTopLevelEditor(myEditor);
         ApplicationManager.getApplication().runWriteAction(new Runnable() {
           public void run() {
-            final Editor topLevelEditor = InjectedLanguageUtil.getTopLevelEditor(myEditor);
             final TemplateState state = TemplateManagerImpl.getTemplateState(topLevelEditor);
             assert state != null;
             final int segmentsCount = state.getSegmentsCount();
@@ -691,9 +691,9 @@ public class VariableInplaceRenamer {
             }
           }
         });
+        PsiDocumentManager.getInstance(myProject).commitDocument(topLevelEditor.getDocument());
       }
     }, RENAME_TITLE, null);
-    PsiDocumentManager.getInstance(myProject).commitDocument(myEditor.getDocument());
   }
 
   private static VirtualFile getTopLevelVirtualFile(final FileViewProvider fileViewProvider) {