diff --git a/Source/Editor/Tools/Foliage/EditTab.cs b/Source/Editor/Tools/Foliage/EditTab.cs
index b51be7fee..a03ec57f3 100644
--- a/Source/Editor/Tools/Foliage/EditTab.cs
+++ b/Source/Editor/Tools/Foliage/EditTab.cs
@@ -228,6 +228,7 @@ namespace FlaxEditor.Tools.Foliage
             {
                 _presenter.Select(_proxy);
             }
+            _presenter.Panel.Focus();
         }
 
         private void OnModified()
diff --git a/Source/Editor/Tools/Foliage/FoliageTypesTab.cs b/Source/Editor/Tools/Foliage/FoliageTypesTab.cs
index 8e093cddc..76af13bf8 100644
--- a/Source/Editor/Tools/Foliage/FoliageTypesTab.cs
+++ b/Source/Editor/Tools/Foliage/FoliageTypesTab.cs
@@ -409,6 +409,7 @@ namespace FlaxEditor.Tools.Foliage
             {
                 _presenter.Deselect();
             }
+            _presenter.Panel.Focus();
         }
 
         private void RemoveFoliageType(int index)
diff --git a/Source/Editor/Tools/Foliage/PaintTab.cs b/Source/Editor/Tools/Foliage/PaintTab.cs
index a97c9ffcf..41e545a52 100644
--- a/Source/Editor/Tools/Foliage/PaintTab.cs
+++ b/Source/Editor/Tools/Foliage/PaintTab.cs
@@ -252,6 +252,7 @@ namespace FlaxEditor.Tools.Foliage
             {
                 _presenter.Deselect();
             }
+            _presenter.Panel.Focus();
         }
 
         private void UpdateFoliageTypesList()