diff --git a/Source/Editor/GUI/Docking/DockPanel.cs b/Source/Editor/GUI/Docking/DockPanel.cs
index f6e10e653..ff4039e5f 100644
--- a/Source/Editor/GUI/Docking/DockPanel.cs
+++ b/Source/Editor/GUI/Docking/DockPanel.cs
@@ -290,6 +290,10 @@ namespace FlaxEditor.GUI.Docking
                 }
                 OnSelectedTabChanged();
             }
+            else if (autoFocus && _selectedTab != null && !_selectedTab.ContainsFocus)
+            {
+                _selectedTab.Focus();
+            }
         }
 
         /// <summary>