diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
index 80e4f965faa1..c9030e857d71 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
@@ -831,8 +831,8 @@ public class TemplateState implements Disposable {
     if (selStart >= 0 && selEnd >= 0) {
       myEditor.getSelectionModel().setSelection(mySegments.getSegmentStart(selStart), mySegments.getSegmentStart(selEnd));
     }
-    fireBeforeTemplateFinished();
     final Editor editor = myEditor;
+    fireBeforeTemplateFinished();
     int oldVar = myCurrentVariableNumber;
     setCurrentVariableNumber(-1);
     currentVariableChanged(oldVar);
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
index b9520b91474e..d88bad4109c3 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
@@ -238,6 +238,8 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer {
     if (success) {
       ((EditorImpl)InjectedLanguageUtil.getTopLevelEditor(myEditor)).startDumb();
       revertState();
+    } else {
+      ((EditorImpl)InjectedLanguageUtil.getTopLevelEditor(myEditor)).stopDumb();
     }
   }