diff --git a/gui/playlist.c b/gui/playlist.c
index 75b75635..aca72eeb 100644
--- a/gui/playlist.c
+++ b/gui/playlist.c
@@ -212,6 +212,7 @@ bool __gui_playlist_init_idle()
 	db_for_each(artist, next, artist_db_get())
 		gui_playlist_add_artist(ARTIST(artist));
 
+	gui_queue_show(gui_queue(playlist_get_queue(PL_SYSTEM, "Collection")));
 	return true;
 }
 
diff --git a/gui/queue.c b/gui/queue.c
index 57f144d1..61b85966 100644
--- a/gui/queue.c
+++ b/gui/queue.c
@@ -2,6 +2,7 @@
  * Copyright 2016 (c) Anna Schumaker.
  */
 #include <core/filter.h>
+#include <core/playlist.h>
 #include <core/string.h>
 #include <gui/builder.h>
 #include <gui/model.h>
@@ -45,6 +46,11 @@ void __queue_random(GtkToggleButton *button, gpointer data)
 	__queue_toggle_flag(gtk_toggle_button_get_active(button),
 			    gtk_button_get_image(GTK_BUTTON(button)),
 			    Q_RANDOM);
+	if (gq_queue->gq_playlist) {
+		playlist_set_random(gq_queue->gq_playlist->pl_type,
+				    gq_queue->gq_playlist->pl_name,
+				    gtk_toggle_button_get_active(button));
+	}
 }
 
 void __queue_repeat(GtkToggleButton *button, gpointer data)