diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java
index cb1ef9f2c3af..cabd88cbd5d6 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java
@@ -120,7 +120,7 @@ public class AddMethodFix extends LocalQuickFixAndIntentionActionOnPsiElement {
     }
     PsiMethod method = (PsiMethod)myClass.add(myMethodPrototype);
     method = (PsiMethod)method.replace(reformat(project, method));
-    if (editor != null) {
+    if (editor != null && method.getContainingFile() == file) {
       GenerateMembersUtil.positionCaret(editor, method, true);
     }
   }