diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index 8b81c6daa0..b7254398dc 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -95,6 +95,12 @@ void ScreenTextEntry::Input( const DeviceInput& DeviceI, const InputEventType ty
 	default:
 		char c;
 		c = DeviceI.ToChar();
+		if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, DIK_LSHIFT)) ||
+			INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, DIK_RSHIFT)))
+		{
+			c = toupper(c);
+		}
+
 		if( c != '\0' )
 			m_sAnswer += c;
 		m_textAnswer.SetText( m_sAnswer );