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 234f3e81b646..12de46e1bfd5 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
@@ -22,6 +22,7 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.codeInsight.lookup.LookupManager;
 import com.intellij.codeInsight.lookup.impl.LookupImpl;
 import com.intellij.codeInsight.template.*;
+import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
 import com.intellij.codeInsight.template.impl.TemplateState;
 import com.intellij.injected.editor.VirtualFileWindow;
 import com.intellij.lang.LanguageExtension;
@@ -460,10 +461,14 @@ public class VariableInplaceRenamer {
     }
 
     public Result calculateQuickResult(ExpressionContext context) {
-      return new TextResult(myName);
+      return calculateResult(context);
     }
 
     public Result calculateResult(ExpressionContext context) {
+      final TextResult insertedValue = TemplateManagerImpl.getTemplateState(myEditor).getVariableValue(PRIMARY_VARIABLE_NAME);
+      if (insertedValue != null) {
+        if (!insertedValue.getText().isEmpty()) return insertedValue;
+      }
       return new TextResult(myName);
     }