diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
index 28fef28a9ba1..2c3c9fc6c6f1 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
@@ -646,10 +646,9 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
           first = false;
         }
         else {
-          for (VirtualFile file : local.keySet()) {
-            if (intersection.containsKey(file)) {
-              intersection.putValues(file, local.get(file));
-            }
+          intersection.keySet().retainAll(local.keySet());
+          for (VirtualFile file : intersection.keySet()) {
+            intersection.get(file).retainAll(local.get(file));
           }
         }
       }