Index: Slim/Player/Playlist.pm
===================================================================
--- Slim/Player/Playlist.pm	(revision 4418)
+++ Slim/Player/Playlist.pm	(working copy)
@@ -54,11 +54,14 @@
 		$index = Slim::Player::Source::playingSongIndex($client);
 	}
 
+	my objOrUrl;
 	if (defined ${shuffleList($client)}[$index]) {
-		return ${playList($client)}[${shuffleList($client)}[$index]];
+		$objOrUrl = ${playList($client)}[${shuffleList($client)}[$index]];
 	} else {
-		return ${playList($client)}[$index];
+		$objOrUrl = ${playList($client)}[$index];
 	}
+	
+	 return ($objOrUrl) ? $objOrUrl : $ds->objectForUrl($objOrUrl, 1, 1);
 }
 
 sub shuffleList {