diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/HippieCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/HippieCompletionTest.groovy
index 669f0f53bed2..4cad78b0c467 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/HippieCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/HippieCompletionTest.groovy
@@ -61,6 +61,44 @@ $some_long_variable_name<caret>
 
   }
 
+  public void testFromAnotherFile2() {
+    myFixture.configureByText "b.txt", '''
+foo function foo2
+'''
+    myFixture.configureByText "a.txt", '''
+f<caret>
+'''
+
+    complete()
+    myFixture.checkResult '''
+foo2<caret>
+'''
+    complete()
+    myFixture.checkResult '''
+function<caret>
+'''
+    complete()
+    myFixture.checkResult '''
+foo<caret>
+'''
+    myFixture.configureByText "a.txt", '''
+f<caret>
+'''
+    backComplete()
+    myFixture.checkResult '''
+foo<caret>
+'''
+
+    backComplete()
+    myFixture.checkResult '''
+function<caret>
+'''
+    backComplete()
+    myFixture.checkResult '''
+foo2<caret>
+'''
+  }
+
   public void "test no middle matching"() {
     myFixture.configureByText "a.txt", '''
 fooExpression
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieWordCompletionHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieWordCompletionHandler.java
index 8852c855248f..d6ca655a7114 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieWordCompletionHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieWordCompletionHandler.java
@@ -76,7 +76,7 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
       fromOtherFiles = false;
     }
 
-    CompletionVariant nextVariant = computeNextVariant(editor, oldPrefix, lastProposedVariant, data, file, fromOtherFiles);
+    CompletionVariant nextVariant = computeNextVariant(editor, oldPrefix, lastProposedVariant, data, file, fromOtherFiles, false);
     if (nextVariant == null) return;
 
     int replacementEnd = data.startOffset + data.myWordUnderCursor.length();
@@ -110,16 +110,20 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
                                                @Nullable CompletionVariant lastProposedVariant,
                                                final CompletionData data,
                                                PsiFile file,
-                                               boolean includeWordsFromOtherFiles
+                                               boolean includeWordsFromOtherFiles,
+                                               boolean weAlreadyDoBestAttempt
   ) {
     final List<CompletionVariant> variants = computeVariants(editor, new CamelHumpMatcher(StringUtil.notNullize(prefix)), file, includeWordsFromOtherFiles);
-    if (variants.isEmpty()) return null;
+    if (variants.isEmpty()) {
+      return weAlreadyDoBestAttempt ? null:computeNextVariant(editor, prefix, null, data, file, !includeWordsFromOtherFiles, true);
+    }
 
-    if (lastProposedVariant != null) {
+    if (lastProposedVariant != null) { // intern lastProposedVariant
       for (CompletionVariant variant : variants) {
         if (variant.variant.equals(lastProposedVariant.variant)) {
           if (lastProposedVariant.offset > data.startOffset && variant.offset > data.startOffset) lastProposedVariant = variant;
           if (lastProposedVariant.offset < data.startOffset && variant.offset < data.startOffset) lastProposedVariant = variant;
+          if (includeWordsFromOtherFiles && lastProposedVariant.editor == variant.editor) lastProposedVariant = variant;
         }
       }
     }
@@ -129,6 +133,9 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
       CompletionVariant result = null;
 
       if (myForward) {
+        if (includeWordsFromOtherFiles) {
+          return variants.get(variants.size() - 1);
+        }
         for (CompletionVariant variant : variants) {
           if (variant.offset < data.startOffset) {
             result = variant;
@@ -140,6 +147,9 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
         }
       }
       else {
+        if (includeWordsFromOtherFiles) {
+          return variants.get(0);
+        }
         for (CompletionVariant variant : variants) {
           if (variant.offset > data.startOffset) {
             return variant;
@@ -158,7 +168,7 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
       for (CompletionVariant variant : variants) {
         if (variant == lastProposedVariant) {
           if (result == null) {
-            return computeNextVariant(editor, prefix, null, data, file, !includeWordsFromOtherFiles);
+            return computeNextVariant(editor, prefix, null, data, file, !includeWordsFromOtherFiles, true);
           }
           return result;
         }
@@ -175,7 +185,7 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
             return i.next();
           }
           else {
-            return computeNextVariant(editor, prefix, null, data, file, !includeWordsFromOtherFiles);
+            return computeNextVariant(editor, prefix, null, data, file, !includeWordsFromOtherFiles, true);
           }
         }
       }