diff --git a/English.lproj/SpotlightPanel.xib b/English.lproj/SpotlightPanel.xib
index ba4919282..052ce03f6 100644
--- a/English.lproj/SpotlightPanel.xib
+++ b/English.lproj/SpotlightPanel.xib
@@ -1,2225 +1,324 @@
-
-
-
- 1050
- 9C31
- 629
- 949.26
- 352.00
-
-
-
-
-
- 0
- ../../Cog.xcodeproj
- 3
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ FontSizetoLineHeightTransformer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ StringToURLTransformer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ title
+ year
+ artist
+ album
+ genre
+ length
+ track
+ spotlightTrack
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Spotlight/SpotlightWindowController.h b/Spotlight/SpotlightWindowController.h
index fce42af79..18a25dcbd 100644
--- a/Spotlight/SpotlightWindowController.h
+++ b/Spotlight/SpotlightWindowController.h
@@ -23,6 +23,8 @@
- (IBAction)addToPlaylist:(id)sender;
- (IBAction)toggleWindow:(id)sender;
+- (IBAction)pathComponentClicked:(id)sender;
+
- (void)performSearch;
- (NSPredicate *)processSearchString;
diff --git a/Spotlight/SpotlightWindowController.m b/Spotlight/SpotlightWindowController.m
index 26c039071..2810198f1 100644
--- a/Spotlight/SpotlightWindowController.m
+++ b/Spotlight/SpotlightWindowController.m
@@ -283,6 +283,16 @@ static NSPredicate * musicOnlyPredicate = nil;
[self.query enableUpdates];
}
+// If pop-up styled NSPathControl is set to /a/b/c path, then selecting either 'a' or 'b'
+// from its pop-up menu won't do anything by default (while we'd like it to select /a and
+// /a/b respectively). So here we set url of NSPathControl to be that of clicked cell.
+- (IBAction)pathComponentClicked:(id)sender
+{
+ NSPathComponentCell *pcc = [sender clickedPathComponentCell];
+ DLog(@"%@", pcc);
+ [sender setURL:[pcc URL]];
+}
+
#pragma mark NSMetadataQuery delegate methods
// replace the NSMetadataItem with a PlaylistEntry