diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index 1b9d085c3e..84006db773 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -41,7 +41,7 @@ void ScreenSongOptions::ExportOptions( int row, const vector<PlayerNumber> &vpns
 
 void ScreenSongOptions::GoToPrevScreen()
 {
-	if( GAMESTATE->m_bEditing )
+	if( SCREENMAN->IsStackedScreen(this) )
 	{
 		SCREENMAN->PopTopScreen( SM_BackFromSongOptions );
 	}