diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureGestureTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureGestureTest.java
index f4647486699d..c4dc509264e6 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureGestureTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureGestureTest.java
@@ -112,6 +112,7 @@ public class ChangeSignatureGestureTest extends LightCodeInsightFixtureTestCase
   public void testAddParamChangeReturnType() {
     doTest(() -> {
       myFixture.type("int param");
+      PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
       CaretModel model = myFixture.getEditor().getCaretModel();
       PsiElement element = myFixture.getElementAtCaret();
       PsiMethod method = PsiTreeUtil.getParentOfType(element, PsiMethod.class, false);
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtil.java
index ff809a603de0..99debea9c8d3 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtil.java
@@ -140,18 +140,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
 
   private static PsiFile getFile(Project project, Document document) {
     PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(document);
-
-    if (file != null) {
-      if (ApplicationManager.getApplication().isDispatchThread()) {
-        PsiDocumentManager.getInstance(project).commitAllDocuments();
-      }
-
-      if (file instanceof PsiCompiledFile) {
-        file = ((PsiCompiledFile)file).getDecompiledPsiFile();
-      }
-    }
-
-    return file;
+    return file instanceof PsiCompiledFile ? ((PsiCompiledFile)file).getDecompiledPsiFile() : file;
   }
 
   /**