From 6f5605b7ca0945a24fdd8f1325ab787c9242c5ea Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Aug 2021 12:51:20 +0200
Subject: [PATCH] Fix window focus issue when removing actors

---
 Source/Editor/Modules/SceneEditingModule.cs | 4 ++++
 Source/Editor/Windows/PropertiesWindow.cs   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Source/Editor/Modules/SceneEditingModule.cs b/Source/Editor/Modules/SceneEditingModule.cs
index 6b2a7090d..255247671 100644
--- a/Source/Editor/Modules/SceneEditingModule.cs
+++ b/Source/Editor/Modules/SceneEditingModule.cs
@@ -383,6 +383,7 @@ namespace FlaxEditor.Modules
             var objects = Selection.Where(x => x.CanDelete).ToList().BuildAllNodes().Where(x => x.CanDelete).ToList();
             if (objects.Count == 0)
                 return;
+            var isSceneTreeFocus = Editor.Windows.SceneWin.ContainsFocus;
 
             SelectionDeleteBegin?.Invoke();
 
@@ -404,6 +405,9 @@ namespace FlaxEditor.Modules
             SelectionDeleteEnd?.Invoke();
 
             OnDirty(objects);
+
+            if (isSceneTreeFocus)
+                Editor.Windows.SceneWin.Focus();
         }
 
         /// <summary>
diff --git a/Source/Editor/Windows/PropertiesWindow.cs b/Source/Editor/Windows/PropertiesWindow.cs
index 70f58dcc6..f96385536 100644
--- a/Source/Editor/Windows/PropertiesWindow.cs
+++ b/Source/Editor/Windows/PropertiesWindow.cs
@@ -29,6 +29,7 @@ namespace FlaxEditor.Windows
         : base(editor, true, ScrollBars.Vertical)
         {
             Title = "Properties";
+            AutoFocus = true;
 
             Presenter = new CustomEditorPresenter(editor.Undo);
             Presenter.Panel.Parent = this;