diff --git a/src/ch/blinkenlights/android/medialibrary/MediaSchema.java b/src/ch/blinkenlights/android/medialibrary/MediaSchema.java
index 866efc80..1ab1bb1b 100644
--- a/src/ch/blinkenlights/android/medialibrary/MediaSchema.java
+++ b/src/ch/blinkenlights/android/medialibrary/MediaSchema.java
@@ -124,6 +124,13 @@ public class MediaSchema {
 	 +" ("+MediaLibrary.PlaylistSongColumns.PLAYLIST_ID+")"
 	 +";";
 
+	/**
+	 * Index to select a song from a playlist quickly
+	 */
+	private static final String INDEX_IDX_PLAYLIST_ID_SONG = "CREATE INDEX idx_playlist_id_song ON "+MediaLibrary.TABLE_PLAYLISTS_SONGS
+	 +" ("+MediaLibrary.PlaylistSongColumns.PLAYLIST_ID+", "+MediaLibrary.PlaylistSongColumns.SONG_ID+")"
+	 +";";
+
 	/**
 	 * Additional columns to select for artist info
 	 */
@@ -189,6 +196,7 @@ public class MediaSchema {
 		dbh.execSQL(DATABASE_CREATE_PLAYLISTS);
 		dbh.execSQL(DATABASE_CREATE_PLAYLISTS_SONGS);
 		dbh.execSQL(INDEX_IDX_PLAYLIST_ID);
+		dbh.execSQL(INDEX_IDX_PLAYLIST_ID_SONG);
 		dbh.execSQL(VIEW_CREATE_SONGS_ALBUMS_ARTISTS);
 		dbh.execSQL(VIEW_CREATE_ALBUMS_ARTISTS);
 		dbh.execSQL(VIEW_CREATE_ARTISTS);