diff --git a/stepmania/src/Command.cpp b/stepmania/src/Command.cpp
index 7f45679c3d..63cfd41ea4 100644
--- a/stepmania/src/Command.cpp
+++ b/stepmania/src/Command.cpp
@@ -11,7 +11,14 @@ RString Command::GetName() const
 	if( m_vsArgs.empty() )
 		return RString();
 	RString s = m_vsArgs[0];
-	s.MakeLower();
+	TrimLeft( s );
+	TrimRight( s );
+
+	/* Transition hack: if a command begins with !, don't force it to lowercase. */
+	if( s.Left(1) == "!" )
+		s.erase( 0, 1 );
+	else
+		s.MakeLower();
 	return s;
 }