diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 518cb7c920..bf62e25f8c 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -10,6 +10,8 @@ StepMania 5.0 Preview 2 | 20110???
 
 2011/06/13
 ----------
+* [ScreenTextEntry] Make it so only the keyboard's Enter key can finish the
+  screen. Should fix issues with buttons whose secondary function is MenuStart. [AJ]
 * [InputMapper] Modify default mappings. Use the Hyphen key instead of the
   Numlock key for Player 2's GAME_BUTTON_BACK. This should address some
   issues with Player 2 being unable to back out if they use a laptop.
diff --git a/src/ScreenTextEntry.cpp b/src/ScreenTextEntry.cpp
index 994e0fc7a8..ee5fa14164 100644
--- a/src/ScreenTextEntry.cpp
+++ b/src/ScreenTextEntry.cpp
@@ -258,7 +258,8 @@ void ScreenTextEntry::BackspaceInAnswer()
 
 void ScreenTextEntry::MenuStart( const InputEventPlus &input )
 {
-	if( input.type==IET_FIRST_PRESS )
+	// HACK: Only allow the screen to end on the Enter key.-aj
+	if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_ENTER) && input.type==IET_FIRST_PRESS )
 		End( false );
 }