diff --git a/src/org/kreed/vanilla/SongSelector.java b/src/org/kreed/vanilla/SongSelector.java
index 69087e38..568685b0 100644
--- a/src/org/kreed/vanilla/SongSelector.java
+++ b/src/org/kreed/vanilla/SongSelector.java
@@ -696,7 +696,7 @@ public class SongSelector extends PlaybackActivity implements AdapterView.OnItem
 	{
 		super.receive(intent);
 
-		if (mControls != null)
+		if (mControls != null && PlaybackService.EVENT_CHANGED.equals(intent.getAction()))
 			onSongChange((Song)intent.getParcelableExtra("song"));
 	}
 }