diff --git a/res/values/strings.xml b/res/values/strings.xml
index e62d6b80..caa141fa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -72,6 +72,8 @@
 	<string name="playlists">Playlists</string>
 
 	<string name="none">None</string>
+	<string name="unknown">Unknown</string>
+	<string name="title_by_artist">%s by %s</string>
 
 	<!-- Preferences -->
 	<string name="pref_output">Audio Output</string>
diff --git a/src/org/kreed/vanilla/SongSelector.java b/src/org/kreed/vanilla/SongSelector.java
index c8c74625..800ec86a 100644
--- a/src/org/kreed/vanilla/SongSelector.java
+++ b/src/org/kreed/vanilla/SongSelector.java
@@ -571,10 +571,21 @@ public class SongSelector extends PlaybackActivity implements AdapterView.OnItem
 	private void onSongChange(final Song song)
 	{
 		if (mStatusText != null) {
+			Resources res = getResources();
+			CharSequence text;
+			if (song == null) {
+				text = res.getText(R.string.none);
+			} else {
+				String title = song.title == null ? res.getString(R.string.unknown) : song.title;
+				String artist = song.artist == null ? res.getString(R.string.unknown) : song.artist;
+				text = res.getString(R.string.title_by_artist, title, artist);
+			}
+
+			final CharSequence result = text;
 			runOnUiThread(new Runnable() {
 				public void run()
 				{
-					mStatusText.setText(song == null ? getResources().getText(R.string.none) : song.title);
+					mStatusText.setText(result);
 				}
 			});
 		}