diff --git a/src/Editor/Ghost.Editor/View/Controls/DockLayout.cs b/src/Editor/Ghost.Editor/View/Controls/DockLayout.cs
index eaf4191..ff97899 100644
--- a/src/Editor/Ghost.Editor/View/Controls/DockLayout.cs
+++ b/src/Editor/Ghost.Editor/View/Controls/DockLayout.cs
@@ -12,7 +12,7 @@ namespace Ghost.Editor.View.Controls;
 /// A control that renders a docking layout tree.
 /// </summary>
 [TemplatePart(Name = PART_ROOT_GRID, Type = typeof(Grid))]
-[TemplatePart(Name = PART_DROP_TARGET_OVERLAY, Type = typeof(Border))]
+[TemplatePart(Name = PART_DROP_TARGET_OVERLAY, Type = typeof(FrameworkElement))]
 public sealed partial class DockLayout : Control
 {
     private const string PART_ROOT_GRID = "PART_RootGrid";
@@ -20,7 +20,7 @@ public sealed partial class DockLayout : Control
     private const double MIN_PANE_SIZE = 100;
     private const double SPLITTER_THICKNESS = 4;
 
-    private Border? _dropTargetOverlay;
+    private FrameworkElement? _dropTargetOverlay;
     private readonly HashSet<DockNode> _subscribedNodes = new();
 
     internal enum DockPosition { Center, Top, Bottom, Left, Right, None }
@@ -292,7 +292,7 @@ public sealed partial class DockLayout : Control
     protected override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
-        _dropTargetOverlay = GetTemplateChild(PART_DROP_TARGET_OVERLAY) as Border;
+        _dropTargetOverlay = GetTemplateChild(PART_DROP_TARGET_OVERLAY) as FrameworkElement;
         RenderTree();
     }
 }
diff --git a/src/Editor/Ghost.Editor/View/Controls/DockLayout.xaml b/src/Editor/Ghost.Editor/View/Controls/DockLayout.xaml
index 880efde..1a41049 100644
--- a/src/Editor/Ghost.Editor/View/Controls/DockLayout.xaml
+++ b/src/Editor/Ghost.Editor/View/Controls/DockLayout.xaml
@@ -9,13 +9,10 @@
                 <ControlTemplate TargetType="local:DockLayout">
                     <Grid>
                         <Grid x:Name="PART_RootGrid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
-                        <Border x:Name="PART_DropTargetOverlay" 
-                                Background="{ThemeResource SystemControlHighlightAccentBrush}" 
-                                Opacity="0.4"
-                                BorderBrush="{ThemeResource SystemControlHighlightAccentBrush}" 
-                                BorderThickness="2" 
-                                Visibility="Collapsed" 
-                                IsHitTestVisible="False" />
+                        <Grid x:Name="PART_DropTargetOverlay" Visibility="Collapsed" IsHitTestVisible="False">
+                            <Border Background="{ThemeResource SystemControlHighlightAccentBrush}" Opacity="0.4" />
+                            <Border BorderBrush="{ThemeResource SystemControlHighlightAccentBrush}" BorderThickness="2" />
+                        </Grid>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>