diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp
index 0b9eebb2ef..7ed8911adb 100644
--- a/stepmania/src/ScreenPrompt.cpp
+++ b/stepmania/src/ScreenPrompt.cpp
@@ -120,12 +120,12 @@ void ScreenPrompt::HandleScreenMessage( const ScreenMessage SM )
 {
 	switch( SM )
 	{
-	case SM_DoneOpeningWipingRight:
+	case SM_GoToNextScreen:
 		if( SCREENMAN->IsStackedScreen(this) )
+		{
 			SCREENMAN->PopTopScreen( m_smSendOnPop );
-		else
-			this->HandleScreenMessage( SM_GoToNextScreen );
-		break;
+			return;
+		}
 	}
 
 	ScreenWithMenuElements::HandleScreenMessage( SM );
@@ -183,12 +183,12 @@ void ScreenPrompt::End( bool bCancelled )
 {
 	if( bCancelled )
 	{
-		m_Cancel.StartTransitioning( SM_DoneOpeningWipingRight );
+		m_Cancel.StartTransitioning( SM_GoToNextScreen );
 	}
 	else
 	{
 		SCREENMAN->PlayStartSound();
-		m_Out.StartTransitioning( SM_DoneOpeningWipingRight );
+		m_Out.StartTransitioning( SM_GoToNextScreen );
 	}
 
 	OFF_COMMAND( m_textQuestion );
diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index 333a0296b9..44ec0b7b7f 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -271,10 +271,15 @@ void ScreenTextEntry::HandleScreenMessage( const ScreenMessage SM )
 {
 	switch( SM )
 	{
-	case SM_DoneOpeningWipingRight:
-		SCREENMAN->PopTopScreen( m_smSendOnPop );
-		break;
+	case SM_GoToNextScreen:
+		if( SCREENMAN->IsStackedScreen(this) )
+		{
+			SCREENMAN->PopTopScreen( m_smSendOnPop );
+			return;
+		}
 	}
+
+	Screen::HandleScreenMessage( SM );
 }
 
 void ScreenTextEntry::MoveX( int iDir )
@@ -388,7 +393,7 @@ void ScreenTextEntry::End( bool bCancelled )
 		if( m_pOnCancel ) 
 			m_pOnCancel();
 		
-		m_Cancel.StartTransitioning( SM_DoneOpeningWipingRight );
+		m_Cancel.StartTransitioning( SM_GoToNextScreen );
 	}
 	else
 	{
@@ -411,7 +416,7 @@ void ScreenTextEntry::End( bool bCancelled )
 			m_pOnOK( ret );
 		}
 
-		m_Out.StartTransitioning( SM_DoneOpeningWipingRight );
+		m_Out.StartTransitioning( SM_GoToNextScreen );
 		SCREENMAN->PlayStartSound();
 	}