diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
index d0dda3338a89..88669a7a558e 100644
--- a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
+++ b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
@@ -299,7 +299,7 @@ public final class InplaceIntroduceParameterPopup extends AbstractJavaInplaceInt
 
   @Override
   protected void performCleanup() {
-    myEditorState.revert();
+    ApplicationManager.getApplication().invokeLater(() -> myEditorState.revert());
   }
 
   @Override
diff --git a/platform/testFramework/src/com/intellij/refactoring/AbstractInplaceIntroduceTest.java b/platform/testFramework/src/com/intellij/refactoring/AbstractInplaceIntroduceTest.java
index 8ef7444a198f..9058044188b3 100644
--- a/platform/testFramework/src/com/intellij/refactoring/AbstractInplaceIntroduceTest.java
+++ b/platform/testFramework/src/com/intellij/refactoring/AbstractInplaceIntroduceTest.java
@@ -33,6 +33,7 @@ public abstract class AbstractInplaceIntroduceTest extends LightPlatformCodeInsi
       TemplateState state = TemplateManagerImpl.getTemplateState(getEditor());
       assert state != null;
       state.gotoEnd(true);
+      UIUtil.dispatchAllInvocationEvents();
       checkResultByFile(getBasePath() + name + "_after" + getExtension());
     }
     finally {