diff --git a/stepmania/Songs/Instructions.txt b/stepmania/Songs/Instructions.txt
new file mode 100644
index 0000000000..1fc4923d82
--- /dev/null
+++ b/stepmania/Songs/Instructions.txt
@@ -0,0 +1,7 @@
+1. Create a new group by creating a new folder (optional)
+2. In the group folder, create a folder for your song
+3. Copy all the files for your song into the song folder
+ - background (optional)
+ - banner (optional)
+ - music (required)
+ - BMS files or DWI file (required)
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 6539fbbc4e..f6053f315a 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -508,8 +508,15 @@ void MusicWheel::PrevMusic()
 
 void MusicWheel::NextMusic()
 {
-	if( m_WheelState != STATE_IDLE )
-		return;
+	switch( m_WheelState )
+	{
+	case STATE_IDLE:
+	case STATE_SWITCHING_TO_NEXT_MUSIC:
+	case STATE_SWITCHING_TO_PREV_MUSIC:
+		break;	// fall through
+	default:
+		return;	// don't continue
+	}
 
 	MUSIC->Stop();
 
@@ -524,8 +531,15 @@ void MusicWheel::NextMusic()
 
 void MusicWheel::NextSort()
 {
-	if( m_WheelState != STATE_IDLE )
-		return;
+	switch( m_WheelState )
+	{
+	case STATE_IDLE:
+	case STATE_SWITCHING_TO_NEXT_MUSIC:
+	case STATE_SWITCHING_TO_PREV_MUSIC:
+		break;	// fall through
+	default:
+		return;	// don't continue
+	}
 
 	MUSIC->Stop();