diff --git a/Frameworks/Find/src/FFWindowController.mm b/Frameworks/Find/src/FFWindowController.mm
index dc72122a..23540b21 100644
--- a/Frameworks/Find/src/FFWindowController.mm
+++ b/Frameworks/Find/src/FFWindowController.mm
@@ -329,7 +329,8 @@ struct operation_t
 			if([match.path isEqualToString:path])
 			{
 				NSUInteger row = [findAllResultsOutlineView rowForItem:match];
-				[findAllResultsOutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
+				NSUInteger firstMatch = row + ([findAllResultsOutlineView isItemExpanded:match] ? 1 : 0);
+				[findAllResultsOutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:firstMatch] byExtendingSelection:NO];
 				[[findAllResultsOutlineView window] makeFirstResponder:findAllResultsOutlineView];
 				[findAllResultsOutlineView scrollRowToVisible:findAllResultsOutlineView.numberOfRows-1];
 				[findAllResultsOutlineView scrollRowToVisible:row];