diff --git a/src/org/kreed/vanilla/Song.java b/src/org/kreed/vanilla/Song.java
index e9ae5281..1c3b6ef6 100644
--- a/src/org/kreed/vanilla/Song.java
+++ b/src/org/kreed/vanilla/Song.java
@@ -130,7 +130,8 @@ public class Song implements Parcelable {
 		String[] projection = { MediaStore.Audio.Media._ID };
 
 		ContentResolver resolver = ContextApplication.getContext().getContentResolver();
-		Cursor cursor = resolver.query(media, projection, selection, null, null);
+		String sort = MediaStore.Audio.Media.ARTIST_KEY + ',' + MediaStore.Audio.Media.ALBUM_KEY + ',' + MediaStore.Audio.Media.TRACK;
+		Cursor cursor = resolver.query(media, projection, selection, null, sort);
 
 		if (cursor == null)
 			return null;
@@ -211,4 +212,4 @@ public class Song implements Parcelable {
 	{
 		return 0;
 	}
-}
\ No newline at end of file
+}