diff --git a/res/values/strings.xml b/res/values/strings.xml
index e556ec0b..46b4a3be 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -41,6 +41,9 @@
 	<string name="notification_mode_title">Notification Mode</string>
 	<string name="notification_mode_summary">When to show the notification</string>
 
+	<string name="selector_on_startup_title">Open on Startup</string>
+	<string name="selector_on_startup_summary">Open song selector on startup</string>
+
 	<string name="filter_suggestions_title">Use Suggestions in Filter Text</string>
 	<string name="filter_suggestions_summary">Use text suggestions when editing the filter text</string>
 
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 1334068b..1041232c 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -27,13 +27,18 @@
 			android:title="@string/mini_player_title"
 			android:summary="@string/mini_player_summary"
 			android:defaultValue="true" />
-		</PreferenceCategory>
+	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/pref_song_selector">
 		<CheckBoxPreference
 			android:key="filter_suggestions"
 			android:title="@string/filter_suggestions_title"
 			android:summary="@string/filter_suggestions_summary"
 			android:defaultValue="false" />
+		<CheckBoxPreference
+			android:key="selector_on_startup"
+			android:title="@string/selector_on_startup_title"
+			android:summary="@string/selector_on_startup_summary"
+			android:defaultValue="false" />
 		<ListPreference
 			android:key="default_action_int"
 			android:title="@string/default_action_title"
diff --git a/src/org/kreed/vanilla/FullPlaybackActivity.java b/src/org/kreed/vanilla/FullPlaybackActivity.java
index 5412ce20..9249b948 100644
--- a/src/org/kreed/vanilla/FullPlaybackActivity.java
+++ b/src/org/kreed/vanilla/FullPlaybackActivity.java
@@ -23,11 +23,13 @@ import org.kreed.vanilla.R;
 
 import android.app.Dialog;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.RemoteException;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -68,6 +70,10 @@ 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);
+
 		setContentView(R.layout.full_playback);
 
 		mCoverView = (CoverView)findViewById(R.id.cover_view);