diff --git a/src/ch/blinkenlights/android/vanilla/AudioSearchActivity.java b/src/ch/blinkenlights/android/vanilla/AudioSearchActivity.java
index e5e6079b..d51534ee 100644
--- a/src/ch/blinkenlights/android/vanilla/AudioSearchActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/AudioSearchActivity.java
@@ -79,6 +79,7 @@ public class AudioSearchActivity extends PlaybackActivity {
 
 			PlaybackService service = PlaybackService.get(ctx);
 			service.pause();
+			service.setShuffleMode(SongTimeline.SHUFFLE_ALBUMS);
 			service.emptyQueue();
 			service.addSongs(query);
 			if (service.getTimelineLength() > 0) {