diff --git a/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml b/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
index a7e817e..bab8a0d 100644
--- a/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
+++ b/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
@@ -10,7 +10,7 @@
                 <Panel>
                     <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
                     <Border Background="{TemplateBinding Background}">
-                        <VisualLayerManager>
+                        <VisualLayerManager Name="PART_VisualLayerManager">
                             <ContentPresenter
                                 Name="PART_ContentPresenter"
                                 Margin="{TemplateBinding Padding}"
diff --git a/src/Semi.Avalonia/Controls/Popup.axaml b/src/Semi.Avalonia/Controls/Popup.axaml
index 1c6636f..373d2a3 100644
--- a/src/Semi.Avalonia/Controls/Popup.axaml
+++ b/src/Semi.Avalonia/Controls/Popup.axaml
@@ -13,7 +13,7 @@
                 <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
                     <Panel>
                         <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-                        <VisualLayerManager IsPopup="True">
+                        <VisualLayerManager Name="PART_VisualLayerManager">
                             <LayoutTransformControl Name="PART_LayoutTransform">
                                 <ContentPresenter
                                     Name="PART_ContentPresenter"
@@ -37,7 +37,7 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
-                    <VisualLayerManager IsPopup="True">
+                    <VisualLayerManager Name="PART_VisualLayerManager">
                         <LayoutTransformControl Name="PART_LayoutTransform">
                             <ContentPresenter
                                 Name="PART_ContentPresenter"
diff --git a/src/Semi.Avalonia/Controls/Window.axaml b/src/Semi.Avalonia/Controls/Window.axaml
index ef9edb1..a8b566f 100644
--- a/src/Semi.Avalonia/Controls/Window.axaml
+++ b/src/Semi.Avalonia/Controls/Window.axaml
@@ -14,7 +14,7 @@
                     <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
                     <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
-                    <VisualLayerManager>
+                    <VisualLayerManager Name="PART_VisualLayerManager">
                         <ContentPresenter
                             Name="PART_ContentPresenter"
                             Margin="{TemplateBinding Padding}"