diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index d5feab9f04..8cfceac735 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -140,12 +140,13 @@ void ScreenTextEntry::Input( const DeviceInput& DeviceI, const InputEventType ty
 			case ']':	c='}';	break;
 			case '\\':	c='|';	break;
 			case ';':	c=':';	break;
-			case '\'':	c='"';	break;
 			case ',':	c='<';	break;
 			case '.':	c='>';	break;
 			case '/':	c='?';	break;
 			}
 		}
+		if ( !bHoldingShift && (c == '\"') )
+			c = '\'';
 
 		if( c >= ' ' )
 		{