diff --git a/Slim/Menu/BrowseLibrary.pm b/Slim/Menu/BrowseLibrary.pm
index b2662e5..b88055b 100644
--- a/Slim/Menu/BrowseLibrary.pm
+++ b/Slim/Menu/BrowseLibrary.pm
@@ -1339,12 +1339,20 @@
 				
 				# If an artist was not used in the selection criteria or if one was
 				# used but is different to that of the primary artist, then provide 
 				# the primary artist name in name2.
 				if (!$artistId || $artistId != $_->{'artist_id'}) {
+
+					# bug 17542 - get primary artist if it's different from the artist we're browsing albums for
+					if ($artistId) {
+						my $albumArtist = Slim::Schema->find('Contributor', $_->{'artist_id'})->name;
+						$_->{'artist'} = $albumArtist if $albumArtist;
+					}
+
 					$_->{'name2'} = $_->{'artist'};
-				} 
+				}
+
 				if (!$wantMeta) {
 					delete $_->{'artist'};
 				}
 				
 				$_->{'hasMetadata'}   = 'album'