diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java
index 6a5ea1b..9409edb 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceRefactoring.java
@@ -292,24 +292,25 @@
 	private boolean isMatchToBeIncluded(FileMatch match) {
 		IFile file= match.getFile();
 		URI uri= file.getLocationURI();
-		if (uri == null)
+		if (uri == null) {
 			return true;
+		}
+		if (file.equals(fAlreadyCollected.get(uri))) {
+			return true; // another FileMatch for an IFile which already had
+							// matches
+		}
 
 		for (URI uri2 : fAlreadyCollected.keySet()) {
 			if (URIUtil.equals(uri2, uri)) {
-				if (file.equals(fAlreadyCollected.get(uri)))
-					return true; // another FileMatch for an IFile which already had matches
-
-				if (fIgnoredMatches == null)
+				if (fIgnoredMatches == null) {
 					fIgnoredMatches= new HashMap<>();
-
+				}
 				ArrayList<FileMatch> matches= fIgnoredMatches.get(uri);
 				if (matches == null) {
 					matches= new ArrayList<>();
 					fIgnoredMatches.put(uri, matches);
 				}
 				matches.add(match);
-
 				return false;
 			}
 		}