Index: Slim/Web/Pages/Playlist.pm
===================================================================
--- Slim/Web/Pages/Playlist.pm	(revision 10255)
+++ Slim/Web/Pages/Playlist.pm	(working copy)
@@ -157,10 +157,10 @@
 		if ($itemnum == $currsongind) {
 			$form{'currentsong'} = "current";
 
-			if (Slim::Music::Info::isRemoteURL($track)) {
+			if (Slim::Music::Info::isRemoteURL($track->url)) {
+				$form{'title'} = Slim::Music::Info::getCurrentTitle(undef, $track->url);
+			} else {
 				$form{'title'} = Slim::Music::Info::standardTitle(undef, $track);
-			} else {
-				$form{'title'} = Slim::Music::Info::getCurrentTitle(undef, $track);
 			}
 
 		} else {
Index: Slim/Buttons/TrackInfo.pm
===================================================================
--- Slim/Buttons/TrackInfo.pm	(revision 10255)
+++ Slim/Buttons/TrackInfo.pm	(working copy)
@@ -456,9 +456,9 @@
 
 			if ($num < 0) {
 
-				$num = Slim::Utils::Favorites->clientAdd($client, track($client), $track->title);
+				$num = Slim::Utils::Favorites->clientAdd($client, track($client), $track->title || Slim::Music::Info::getCurrentTitle($client, $track->url));
 
-				$client->showBriefly($client->string('FAVORITES_ADDING'), $track->title);
+				$client->showBriefly($client->string('FAVORITES_ADDING'), $track->title || Slim::Music::Info::getCurrentTitle($client, $track->url));
 
 				$client->modeParam('favorite', $num);
 
@@ -466,7 +466,7 @@
 
 				Slim::Utils::Favorites->deleteByClientAndURL($client, track($client));
 
-				$client->showBriefly($client->string('FAVORITES_DELETING'), $track->title);
+				$client->showBriefly($client->string('FAVORITES_DELETING'), $track->title || Slim::Music::Info::getCurrentTitle($client, $track->url));
 
 				$client->modeParam('favorite', -1);
 			}