diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 12fa685dcd..ff89c92185 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2744,7 +2744,7 @@ Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 HelpText=Screen.String("HelpTextMapControllers")
 #
-ScreenOnCommand=%function(self) MESSAGEMAN:Broadcast("KeyConfigRequestStall"); end;
+ScreenOnCommand=%function(self) MESSAGEMAN:Broadcast("KeyConfigRequestStall"); self:lockinput(5); end;
 #
 DevicesX=SCREEN_CENTER_X
 DevicesY=SCREEN_TOP+24
diff --git a/src/ScreenMapControllers.cpp b/src/ScreenMapControllers.cpp
index d2ed7b085e..ca5fa7cbed 100644
--- a/src/ScreenMapControllers.cpp
+++ b/src/ScreenMapControllers.cpp
@@ -230,6 +230,9 @@ static bool IsAxis( const DeviceInput& DeviceI )
 
 void ScreenMapControllers::Input( const InputEventPlus &input )
 {
+	if( m_fLockInputSecs > 0 )
+		return;
+	
 	if( input.type != IET_FIRST_PRESS && input.type != IET_REPEAT )
 		return;	// ignore
 	if( IsTransitioning() )