diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index 84006db773..b12638c7db 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -54,7 +54,7 @@ void ScreenSongOptions::GoToPrevScreen()
 
 void ScreenSongOptions::GoToNextScreen()
 {
-	if( GAMESTATE->m_bEditing )
+	if( SCREENMAN->IsStackedScreen(this) )
 		SCREENMAN->PopTopScreen( SM_BackFromSongOptions );
 	else
 		SCREENMAN->SetNewScreen( NEXT_SCREEN );