diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index be1f29fc14..9a7497325b 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -144,10 +144,10 @@ void ScreenMapControllers::Input( const DeviceInput& DeviceI, const InputEventTy
 
 	if( m_bWaitingForPress )	// we're going to map an input
 	{	
-		//MAKE SURE F1 AND LCTRL CANNOT BE USED! THESE ARE PREDEFINED IN STEPMANIA.CPP
-		if ( DeviceI.button == SDLK_LCTRL || DeviceI.button == SDLK_F1 )
+		/* Don't allow function keys to be mapped. */
+		if ( DeviceI.device == DEVICE_KEYBOARD && (DeviceI.button >= SDLK_F1 && DeviceI.button <= SDLK_F12) )
 		{
-			m_textError.SetText( "F1 & Left-Control are system keys, and cannot be mapped." );
+			m_textError.SetText( "That key can not be mapped." );
 			SOUNDMAN->PlayOnce( THEME->GetPathTo( "sounds","menu invalid" ) );
 			m_textError.StopTweening();
 			m_textError.SetDiffuse( RageColor(0,1,0,1) );