diff --git a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
index c4b0fe0051..8afcb6d4d6 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
@@ -108,29 +108,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				panel.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => Game.Settings.Player.Color.RGB;
 			}
 
-			Action closeAssetBrowser = () =>
-			{
-				if (isVideoLoaded)
-					player.Stop();
-				Ui.CloseWindow();
-				onExit();
-			};
-
 			filenameInput = panel.Get<TextFieldWidget>("FILENAME_INPUT");
-			filenameInput.TakeKeyboardFocus();
 			filenameInput.OnTextEdited = () => ApplyFilter(filenameInput.Text);
-			filenameInput.OnEscKey = () =>
-			{
-				if (filenameInput.Text.Length == 0)
-					closeAssetBrowser();
-				else
-				{
-					filenameInput.Text = "";
-					filenameInput.OnTextEdited();
-				}
-
-				return true;
-			};
+			filenameInput.OnEscKey = filenameInput.YieldKeyboardFocus;
 
 			var frameContainer = panel.GetOrNull("FRAME_SELECTOR");
 			if (frameContainer != null)
@@ -238,7 +218,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 			var closeButton = panel.GetOrNull<ButtonWidget>("CLOSE_BUTTON");
 			if (closeButton != null)
-				closeButton.OnClick = closeAssetBrowser;
+				closeButton.OnClick = () =>
+				{
+					if (isVideoLoaded)
+						player.Stop();
+					Ui.CloseWindow();
+					onExit();
+				};
 		}
 
 		void SelectNextFrame()