diff --git a/index.html b/index.html
index f712613..d87c3b1 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
 	var g_playlist = null;
 	var g_previous = [];
 	var g_previous_idx = 0;
-	var g_current = 1;
+	var g_current = -1;
 	var g_looping = false;
 	var g_shuffle = true;
 	var MAX_HISTORY = 10;
@@ -105,7 +105,7 @@
 			return;
 
 		if (g_previous_idx >= (g_previous.length - 1)) {
-			if (g_shuffle) {
+			if (g_shuffle || g_current === -1) {
 				g_current = Math.floor (Math.random () * g_playlist.length);
 			}
 			else {