diff --git a/stepmania/src/arch/InputHandler/InputHandler.cpp b/stepmania/src/arch/InputHandler/InputHandler.cpp
index 16c3711a36..b071bb464a 100644
--- a/stepmania/src/arch/InputHandler/InputHandler.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler.cpp
@@ -124,7 +124,7 @@ RString InputHandler::GetDeviceSpecificInputString( const DeviceInput &di )
 	{
 		wchar_t c = DeviceButtonToChar( di.button, false );
 		if( c && c != L' ' )				// Don't show "Key  " for space.
-			return "Key " + Capitalize( WStringToRString(wstring()+c) );
+			return InputDeviceToString(di.device) + " " + + Capitalize( WStringToRString(wstring()+c) );
 		return DeviceButtonToString( di.button );
 	}