diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml
index 6a5cbaee..0b4a53fe 100644
--- a/res/values/untranslatable.xml
+++ b/res/values/untranslatable.xml
@@ -76,14 +76,30 @@ THE SOFTWARE.
 		<item>@string/seek_10s_forward</item>
 		<item>@string/seek_10s_backward</item>
 	</string-array>
+
+	<!-- START playlist action entries definition -->
 	<string-array name="default_playlist_action_entries">
 		<item>@string/play</item>
 		<item>@string/enqueue</item>
 		<item>@string/last_used_action</item>
 		<item>@string/play_all</item>
 		<item>@string/enqueue_all</item>
+		<item>@string/play_or_enqueue</item>
+		<item>@string/enqueue_as_next</item>
 		<item>@string/do_nothing</item>
 	</string-array>
+	<string-array name="default_playlist_action_entry_values">
+		<item>0</item> <!-- play             -->
+		<item>1</item> <!-- enqueue          -->
+		<item>2</item> <!-- last_actin_used  -->
+		<item>3</item> <!-- play_all         -->
+		<item>4</item> <!-- enqueue_all      -->
+		<item>7</item> <!-- play_or_enqueue  -->
+		<item>8</item> <!-- enqueue_as_ next -->
+		<item>5</item> <!-- do_nothing       -->
+	</string-array>
+	<!-- END playlist action entries definition -->
+
 	<string-array name="default_action_entries">
 		<item>@string/play</item>
 		<item>@string/enqueue</item>
diff --git a/res/xml/preference_library.xml b/res/xml/preference_library.xml
index b8292279..eb61da3a 100644
--- a/res/xml/preference_library.xml
+++ b/res/xml/preference_library.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
 		android:key="default_playlist_action"
 		android:title="@string/default_playlist_action_title"
 		android:entries="@array/default_playlist_action_entries"
-		android:entryValues="@array/entry_values"
+		android:entryValues="@array/default_playlist_action_entry_values"
 		android:defaultValue="0" />
 	<PreferenceScreen
 		android:title="@string/filebrowser_start"
diff --git a/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java b/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java
index 13715f1a..5242257f 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaylistActivity.java
@@ -233,6 +233,9 @@ public class PlaylistActivity extends Activity
 	 */
 	private void performAction(int action, int position, long audioId)
 	{
+		if (action == LibraryActivity.ACTION_PLAY_OR_ENQUEUE)
+			action = (PlaybackService.get(this).isPlaying() ? LibraryActivity.ACTION_ENQUEUE : LibraryActivity.ACTION_PLAY);
+
 		if (action == LibraryActivity.ACTION_LAST_USED)
 			action = mLastAction;