Yield keyboard focus on search field when selection is changed

Deregister event handlers for selection change on dispose

OpenRA.Mods.Common/Widgets/Logic/Editor/CommonSelectorLogic.cs

@@ -71,6 +71,8 @@ protected CommonSelectorLogic(Widget widget, ModData modData, World world, World
 				return true;
 			};
 
+			Editor.DefaultBrush.SelectionChanged += HandleSelectionChanged;
+
 			var none = TranslationProvider.GetString(None);
 			var searchResults = TranslationProvider.GetString(SearchResults);
 			var all = TranslationProvider.GetString(All);
@@ -103,6 +105,18 @@ protected CommonSelectorLogic(Widget widget, ModData modData, World world, World
 			};
 		}
 
+		protected override void Dispose(bool disposing)
+		{
+			Editor.DefaultBrush.SelectionChanged -= HandleSelectionChanged;
+
+			base.Dispose(disposing);
+		}
+
+		void HandleSelectionChanged()
+		{
+			SearchTextField.YieldKeyboardFocus();
+		}
+
 		protected Widget CreateCategoriesPanel(ScrollPanelWidget panel)
 		{
 			var categoriesPanel = Ui.LoadWidget("CATEGORY_FILTER_PANEL", null, new WidgetArgs());

OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorTabsLogic.cs

@@ -41,6 +41,13 @@ public MapEditorTabsLogic(Widget widget)
 			SetupTab("HISTORY_TAB", "HISTORY_WIDGETS", MenuType.History);
 		}
 
+		protected override void Dispose(bool disposing)
+		{
+			editor.DefaultBrush.SelectionChanged -= HandleSelectionChanged;
+
+			base.Dispose(disposing);
+		}
+
 		void SetupTab(string buttonId, string tabId, MenuType tabType)
 		{
 			if (buttonId != null)