diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapGeneratorToolLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapGeneratorToolLogic.cs
index ff1d083914..74503a2f8d 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapGeneratorToolLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapGeneratorToolLogic.cs
@@ -230,6 +230,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 							input.IsValid = () => valid;
 						};
 
+						input.OnEscKey = _ => { input.YieldKeyboardFocus(); return true; };
+						input.OnEnterKey = _ => { input.YieldKeyboardFocus(); return true; };
 						break;
 					}