diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
index 5c505da612f5..ce8427166dc2 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
@@ -259,6 +259,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageBaseFix {
       startTemplate(newEditor, template, project, new TemplateEditingAdapter() {
         @Override
         public void templateFinished(Template template, boolean brokenOff) {
+          if (brokenOff) return;
           WriteCommandAction.runWriteCommandAction(project, () -> {
             PsiDocumentManager.getInstance(project).commitDocument(newEditor.getDocument());
             final int offset = newEditor.getCaretModel().getOffset();
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy
index 75ee4fb449bf..c285cd4fd716 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy
@@ -127,7 +127,7 @@ class Usage {
       PsiDocumentManager.getInstance(getFile().project).commitDocument(document)
     }
     
-    state.gotoEnd()
+    state.gotoEnd(false)
   }
 
   public void "test prefer outer class when static is not applicable for inner"() {
@@ -153,7 +153,7 @@ class A {
       PsiDocumentManager.getInstance(getFile().project).commitDocument(document)
     }
     
-    state.gotoEnd()
+    state.gotoEnd(false)
 
     checkResultByText """
 class A {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
index 86d82a44d651..6659c8fb0d1b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
@@ -191,7 +191,7 @@ public class TemplateManagerImpl extends TemplateManager implements Disposable {
     }
 
     if (shouldSkipInTests()) {
-      if (!templateState.isFinished()) templateState.gotoEnd();
+      if (!templateState.isFinished()) templateState.gotoEnd(false);
     }
   }