diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index d564b4c83d..8a3813f98d 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -514,9 +514,16 @@ void ScreenNameEntryTraditional::Input( const InputEventPlus &input )
 	{
 		int c;
 		if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_BACK) )
+		{
 			c = CHAR_BACK;
+		}
 		else
-			c = towupper( INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true) );
+		{
+			wchar_t ch = INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true);
+			MakeUpper( &ch, 1 );
+			c = ch;
+		}
+
 		if( c )
 		{
 			PlayerNumber pn = GAMESTATE->m_MasterPlayerNumber;
diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 8a728b15f8..0796cc7e60 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -129,7 +129,8 @@ void ScreenNetSelectMusic::Input( const InputEventPlus &input )
 		INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL)) ||
 		(!NSMAN->useSMserver);	//If we are disconnected, assume no chatting
 
-	wchar_t c = (wchar_t) towupper( INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true) );
+	wchar_t c = INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true);
+	MakeUpper( &c, 1 );
 
 	if ( bHoldingCtrl && ( c >= 'A' ) && ( c <= 'Z' ) )
 	{
diff --git a/stepmania/src/arch/InputHandler/InputHandler.cpp b/stepmania/src/arch/InputHandler/InputHandler.cpp
index f0327e5ee1..133b65d317 100644
--- a/stepmania/src/arch/InputHandler/InputHandler.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler.cpp
@@ -68,7 +68,7 @@ wchar_t InputHandler::DeviceButtonToChar( DeviceButton button, bool bUseCurrentK
 		
 		if( bHoldingShift && !bHoldingCtrl )
 		{
-			c = towupper(c);
+			MakeUpper( &c, 1 );
 
 			switch( c )
 			{