1 files changed, 10 insertions, 5 deletions

diff --git a/apps/main_menu.c b/apps/main_menu.c
index 0b4da978d8..7ecd6a48c3 100644
--- a/apps/main_menu.c
+++ b/apps/main_menu.c
@@ -168,14 +168,19 @@ void scroll_speed(void)
 void shuffle(void)
 {
     lcd_clear_display();
-    lcd_puts(0,0,"Shuffling...");
-    lcd_update();
+    if(playlist.amount) {
+        lcd_puts(0,0,"Shuffling...");
+        lcd_update();
 #ifdef SIMULATOR
-    randomise_playlist( &playlist, time() );
+        randomise_playlist( &playlist, time() );
 #else
-    randomise_playlist( &playlist, current_tick );
+        randomise_playlist( &playlist, current_tick );
 #endif
-    lcd_puts(0,1,"Done.");
+        lcd_puts(0,1,"Done.");
+    }
+    else {
+        lcd_puts(0,0,"No playlist");
+    }
     lcd_update();
     sleep(HZ);
 }