diff --git a/Frameworks/OakFileBrowser/src/ui/OFBPathInfoCell.h b/Frameworks/OakFileBrowser/src/ui/OFBPathInfoCell.h
index e6b969d9..ca7bb83d 100644
--- a/Frameworks/OakFileBrowser/src/ui/OFBPathInfoCell.h
+++ b/Frameworks/OakFileBrowser/src/ui/OFBPathInfoCell.h
@@ -11,6 +11,7 @@ PUBLIC @interface OFBPathInfoCell : OakImageAndTextCell
 @property (nonatomic, assign) BOOL isOpen;
 @property (nonatomic, assign) BOOL isVisible;
 @property (nonatomic, assign) BOOL isLoading;
+@property (nonatomic, assign) BOOL disableHighlight;
 
 - (NSRect)closeButtonRectInFrame:(NSRect)cellFrame;
 @end
diff --git a/Frameworks/OakFileBrowser/src/ui/OFBPathInfoCell.mm b/Frameworks/OakFileBrowser/src/ui/OFBPathInfoCell.mm
index ae8737cc..2e849890 100644
--- a/Frameworks/OakFileBrowser/src/ui/OFBPathInfoCell.mm
+++ b/Frameworks/OakFileBrowser/src/ui/OFBPathInfoCell.mm
@@ -93,6 +93,15 @@ static void DrawSpinner (NSRect cellFrame, BOOL isFlipped, NSColor* color, doubl
 	return NSMouseInRect(mousePoint, [self closeButtonRectInFrame:cellFrame], controlView.isFlipped);
 }
 
+- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView
+{
+	BOOL wasHighlighted = self.isHighlighted;
+	if(self.disableHighlight)
+		self.highlighted = NO;
+	[super drawInteriorWithFrame:cellFrame inView:controlView];
+	self.highlighted = wasHighlighted;
+}
+
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView
 {
 	if([controlView respondsToSelector:@selector(indentationPerLevel)])
diff --git a/Frameworks/OakFilterList/src/FileChooser.mm b/Frameworks/OakFilterList/src/FileChooser.mm
index 8eb7a39d..4eb17db1 100644
--- a/Frameworks/OakFilterList/src/FileChooser.mm
+++ b/Frameworks/OakFilterList/src/FileChooser.mm
@@ -34,14 +34,34 @@ static NSButton* OakCreateScopeButton (NSString* label, SEL action, NSUInteger t
 
 @implementation OakNonActivatingTableView
 - (BOOL)acceptsFirstResponder { return NO; }
+
+- (NSCell*)preparedCellAtColumn:(NSInteger)column row:(NSInteger)row
+{
+	OFBPathInfoCell* res = (OFBPathInfoCell*)[super preparedCellAtColumn:column row:row];
+	res.disableHighlight = YES;
+	return res;
+}
+
+- (void)highlightSelectionInClipRect:(NSRect)clipRect
+{
+	[[NSColor alternateSelectedControlColor] set];
+	[[self selectedRowIndexes] enumerateRangesInRange:[self rowsInRect:clipRect] options:0 usingBlock:^(NSRange range, BOOL* stop){
+		for(NSUInteger row = range.location; row < NSMaxRange(range); ++row)
+		{
+			NSRect rect = [self rectOfRow:row];
+			rect.size.height -= 1;
+			NSRectFill(rect);
+		}
+	}];
+}
 @end
 
-static NSMutableAttributedString* CreateAttributedStringWithMarkedUpRanges (NSFont* baseFont, std::string const& in, std::vector< std::pair<size_t, size_t> > const& ranges, size_t offset = 0)
+static NSMutableAttributedString* CreateAttributedStringWithMarkedUpRanges (NSFont* baseFont, NSColor* textColor, NSColor* matchedTextColor, std::string const& in, std::vector< std::pair<size_t, size_t> > const& ranges, size_t offset = 0)
 {
 	NSFont* boldFont = [[NSFontManager sharedFontManager] convertFont:baseFont toHaveTrait:NSBoldFontMask];
 
-	NSDictionary* baseAttributes      = @{ NSForegroundColorAttributeName : [NSColor darkGrayColor], NSFontAttributeName : baseFont };
-	NSDictionary* highlightAttributes = @{ NSForegroundColorAttributeName : [NSColor blackColor],    NSFontAttributeName : boldFont, NSUnderlineStyleAttributeName : @1 };
+	NSDictionary* baseAttributes      = @{ NSForegroundColorAttributeName : textColor,        NSFontAttributeName : baseFont };
+	NSDictionary* highlightAttributes = @{ NSForegroundColorAttributeName : matchedTextColor, NSFontAttributeName : boldFont, NSUnderlineStyleAttributeName : @1 };
 
 	NSMutableAttributedString* res = [[NSMutableAttributedString alloc] init];
 
@@ -672,7 +692,7 @@ inline void rank_record (document_record_t& record, filter_string_t const& filte
 		std::string path = prefix + record.display;
 		size_t offset = prefix.size();
 
-		NSMutableAttributedString* str = CreateAttributedStringWithMarkedUpRanges(_statusTextField.font, path, record.cover, offset);
+		NSMutableAttributedString* str = CreateAttributedStringWithMarkedUpRanges(_statusTextField.font, [NSColor darkGrayColor], [NSColor blackColor], path, record.cover, offset);
 		NSMutableParagraphStyle* pStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
 		[pStyle setLineBreakMode:NSLineBreakByTruncatingHead];
 		[str addAttribute:NSParagraphStyleAttributeName value:pStyle range:NSMakeRange(0, str.length)];
@@ -704,7 +724,15 @@ inline void rank_record (document_record_t& record, filter_string_t const& filte
 			path += " — " + text::join(v, "/");
 		}
 
-		NSMutableAttributedString* str = CreateAttributedStringWithMarkedUpRanges(_tableView.font ?: [NSFont controlContentFontOfSize:13], path, record.cover);
+		NSColor* textColor        = [NSColor darkGrayColor];
+		NSColor* matchedTextColor = [NSColor blackColor];
+		if([aTableView isRowSelected:rowIndex])
+		{
+			textColor        = [NSColor alternateSelectedControlTextColor];
+			matchedTextColor = [NSColor alternateSelectedControlTextColor];
+		}
+
+		NSMutableAttributedString* str = CreateAttributedStringWithMarkedUpRanges(_tableView.font ?: [NSFont controlContentFontOfSize:13], textColor, matchedTextColor, path, record.cover);
 		NSMutableParagraphStyle* pStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
 		[pStyle setLineBreakMode:NSLineBreakByTruncatingMiddle];
 		[str addAttribute:NSParagraphStyleAttributeName value:pStyle range:NSMakeRange(0, str.length)];