diff --git a/src/org/kreed/vanilla/FullPlaybackActivity.java b/src/org/kreed/vanilla/FullPlaybackActivity.java
index 9249b948..cb3c28de 100644
--- a/src/org/kreed/vanilla/FullPlaybackActivity.java
+++ b/src/org/kreed/vanilla/FullPlaybackActivity.java
@@ -70,9 +70,11 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli
 	{
 		super.onCreate(icicle);
 
-		SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
-		if (settings.getBoolean("selector_on_startup", false))
-			showDialog(SONG_SELECTOR);
+		if (icicle == null) {
+			SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
+			if (settings.getBoolean("selector_on_startup", false))
+				showDialog(SONG_SELECTOR);
+		}
 
 		setContentView(R.layout.full_playback);