diff --git a/src/org/kreed/vanilla/CoverView.java b/src/org/kreed/vanilla/CoverView.java
index 5ac462d5..73cb5e89 100644
--- a/src/org/kreed/vanilla/CoverView.java
+++ b/src/org/kreed/vanilla/CoverView.java
@@ -456,8 +456,11 @@ public class CoverView extends View {
 	public void onReceive(Intent intent)
 	{
 		String action = intent.getAction();
-		if (PlaybackService.EVENT_LOADED.equals(action)) {
-			refreshSongs();
+		if (PlaybackService.EVENT_REPLACE_SONG.equals(action)) {
+			if (intent.getBooleanExtra("all", false))
+				refreshSongs();
+			else
+				mHandler.sendEmptyMessage(2);
 		} else if (PlaybackService.EVENT_CHANGED.equals(action)) {
 			Song currentSong = mSongs[STORE_SIZE / 2];
 			Song playingSong = intent.getParcelableExtra("song");
diff --git a/src/org/kreed/vanilla/PlaybackActivity.java b/src/org/kreed/vanilla/PlaybackActivity.java
index 46af9adb..6d2f81b6 100644
--- a/src/org/kreed/vanilla/PlaybackActivity.java
+++ b/src/org/kreed/vanilla/PlaybackActivity.java
@@ -58,7 +58,7 @@ public abstract class PlaybackActivity extends Activity implements ServiceConnec
 
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(PlaybackService.EVENT_CHANGED);
-		filter.addAction(PlaybackService.EVENT_LOADED);
+		filter.addAction(PlaybackService.EVENT_REPLACE_SONG);
 		registerReceiver(mReceiver, filter);
 	}
 
diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index 9ca0c334..ba8ac335 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -55,7 +55,7 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 	public static final String TOGGLE_PLAYBACK = "org.kreed.vanilla.action.TOGGLE_PLAYBACK";
 	public static final String NEXT_SONG = "org.kreed.vanilla.action.NEXT_SONG";
 
-	public static final String EVENT_LOADED = "org.kreed.vanilla.event.LOADED";
+	public static final String EVENT_REPLACE_SONG = "org.kreed.vanilla.event.REPLACE_SONG";
 	public static final String EVENT_CHANGED = "org.kreed.vanilla.event.CHANGED";
 
 	public static final int ACTION_PLAY = 0;
@@ -392,7 +392,7 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 		if (mPendingSeek != 0)
 			mMediaPlayer.seekTo(mPendingSeek);
 
-		sendBroadcast(new Intent(EVENT_LOADED));
+		sendBroadcast(new Intent(EVENT_REPLACE_SONG).putExtra("all", true));
 
 		mHandler.sendEmptyMessage(POST_CREATE);