diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 2bc7b32b89..52571cd8e1 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -330,7 +330,7 @@ void ScreenNameEntry::Input( const DeviceInput& DeviceI, const InputEventType ty
 	if( m_Fade.IsClosing() )
 		return;
 
-	if( StyleI.IsValid() )
+	if( StyleI.IsValid() && m_bStillEnteringName[StyleI.player])
 	{
 		int StringIndex = m_ColToStringIndex[StyleI.player][StyleI.col];
 		if(StringIndex != -1)