diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp
index 86b0508446..a4907346d5 100644
--- a/stepmania/src/ScreenTestInput.cpp
+++ b/stepmania/src/ScreenTestInput.cpp
@@ -77,7 +77,7 @@ void ScreenTestInput::Update( float fDeltaTime )
 					CString sName = GAMESTATE->GetCurrentGameDef()->m_szButtonNames[gi.button];
 					CString sSecondary = GAMESTATE->GetCurrentGameDef()->m_szSecondaryFunction[gi.button];
 					
-					sTemp += "  (" + sName + ")  " + sSecondary;
+					sTemp += ssprintf("  (Controller %d %s)  %s", gi.controller+1, sName.c_str(), sSecondary.c_str() );
 				}
 				else
 				{