diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp
index 2057ba7d0a..90479addf7 100644
--- a/stepmania/src/ScreenTitleMenu.cpp
+++ b/stepmania/src/ScreenTitleMenu.cpp
@@ -232,7 +232,8 @@ void ScreenTitleMenu::Input( const DeviceInput& DeviceI, const InputEventType ty
 			break;
 		/* break if the choice is invalid */
 		if( m_Choice == CHOICE_JUKEBOX  ||
-			m_Choice == CHOICE_EDIT )
+			m_Choice == CHOICE_EDIT ||
+			m_Choice == CHOICE_EDIT_COURSES )
 		{
 			if( SONGMAN->GetNumSongs() == 0 )
 			{
@@ -252,12 +253,6 @@ void ScreenTitleMenu::Input( const DeviceInput& DeviceI, const InputEventType ty
 				SCREENMAN->SystemMessage( "No courses are installed" );
 				return;
 			}
-			if( SONGMAN->GetNumSongs() == 0 )
-			{
-				m_soundInvalid.Play();
-				SCREENMAN->SystemMessage( "No songs are installed" );
-				return;
-			}
 		}
 		if( m_Choice == CHOICE_EXIT )
 		{