diff --git a/Source/Editor/Windows/Assets/PrefabWindow.cs b/Source/Editor/Windows/Assets/PrefabWindow.cs
index c9b5ed396..3a4e544c1 100644
--- a/Source/Editor/Windows/Assets/PrefabWindow.cs
+++ b/Source/Editor/Windows/Assets/PrefabWindow.cs
@@ -119,9 +119,9 @@ namespace FlaxEditor.Windows.Assets
             var headerPanel = new ContainerControl
             {
                 AnchorPreset = AnchorPresets.HorizontalStretchTop,
-                IsScrollable = true,
+                BackgroundColor = Style.Current.Background,
+                IsScrollable = false,
                 Offsets = new Margin(0, 0, 0, 18 + 6),
-                Parent = sceneTreePanel,
             };
             _searchBox = new TextBox
             {
@@ -143,6 +143,7 @@ namespace FlaxEditor.Windows.Assets
             _tree.SelectedChanged += OnTreeSelectedChanged;
             _tree.RightClick += OnTreeRightClick;
             _tree.Parent = sceneTreePanel;
+            headerPanel.Parent = sceneTreePanel;
 
             // Prefab viewport
             _viewport = new PrefabWindowViewport(this)
diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index 5bd4549fa..bd37610ac 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -107,9 +107,9 @@ namespace FlaxEditor.Windows
             var headerPanel = new ContainerControl
             {
                 AnchorPreset = AnchorPresets.HorizontalStretchTop,
-                IsScrollable = true,
+                BackgroundColor = Style.Current.Background,
+                IsScrollable = false,
                 Offsets = new Margin(0, 0, 0, 18 + 6),
-                Parent = _split.Panel1,
             };
             _foldersSearchBox = new TextBox
             {
@@ -127,6 +127,7 @@ namespace FlaxEditor.Windows
                 Parent = _split.Panel1,
             };
             _tree.SelectedChanged += OnTreeSelectionChanged;
+            headerPanel.Parent = _split.Panel1;
 
             // Content items searching query input box and filters selector
             var contentItemsSearchPanel = new ContainerControl
diff --git a/Source/Editor/Windows/SceneTreeWindow.cs b/Source/Editor/Windows/SceneTreeWindow.cs
index 636288d93..e6c060aa9 100644
--- a/Source/Editor/Windows/SceneTreeWindow.cs
+++ b/Source/Editor/Windows/SceneTreeWindow.cs
@@ -151,9 +151,9 @@ namespace FlaxEditor.Windows
             var headerPanel = new ContainerControl
             {
                 AnchorPreset = AnchorPresets.HorizontalStretchTop,
-                IsScrollable = true,
+                BackgroundColor = Style.Current.Background,
+                IsScrollable = false,
                 Offsets = new Margin(0, 0, 0, 18 + 6),
-                Parent = this,
             };
             _searchBox = new TextBox
             {
@@ -177,6 +177,7 @@ namespace FlaxEditor.Windows
             _tree.SelectedChanged += Tree_OnSelectedChanged;
             _tree.RightClick += OnTreeRightClick;
             _tree.Parent = this;
+            headerPanel.Parent = this;
 
             // Setup input actions
             InputActions.Add(options => options.TranslateMode, () => Editor.MainTransformGizmo.ActiveMode = TransformGizmoBase.Mode.Translate);