diff --git a/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
index 3acab7d7bc..9ffe51fae8 100644
--- a/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Default/EmbeddableControlRoot.xaml
@@ -3,7 +3,8 @@
   <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
   <Setter Property="Template">
     <ControlTemplate>
-      <Border Name="PART_TransparencyFallback">
+      <Panel>
+        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
         <Border Background="{TemplateBinding Background}">
           <VisualLayerManager>
             <ContentPresenter Name="PART_ContentPresenter"
@@ -12,7 +13,7 @@
                               Margin="{TemplateBinding Padding}"/>
           </VisualLayerManager>
         </Border>
-      </Border>
+      </Panel>
     </ControlTemplate>
   </Setter>
 </Style>
diff --git a/src/Avalonia.Themes.Default/OverlayPopupHost.xaml b/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
index e57325499d..36dbc1b761 100644
--- a/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Default/OverlayPopupHost.xaml
@@ -2,7 +2,8 @@
   <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
   <Setter Property="Template">
     <ControlTemplate>
-      <Border Name="PART_TransparencyFallback">
+      <Panel>
+        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
         <VisualLayerManager IsPopup="True">
           <ContentPresenter Name="PART_ContentPresenter"
                             Background="{TemplateBinding Background}"
@@ -10,7 +11,7 @@
                             Content="{TemplateBinding Content}"
                             Padding="{TemplateBinding Padding}"/>
         </VisualLayerManager>
-      </Border>
+      </Panel>
     </ControlTemplate>
   </Setter>
 </Style>
diff --git a/src/Avalonia.Themes.Default/PopupRoot.xaml b/src/Avalonia.Themes.Default/PopupRoot.xaml
index 1a55d2f7a4..9af4f5a910 100644
--- a/src/Avalonia.Themes.Default/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Default/PopupRoot.xaml
@@ -2,7 +2,8 @@
   <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
   <Setter Property="Template">
     <ControlTemplate>
-      <Border Name="PART_TransparencyFallback">
+      <Panel>
+        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
         <VisualLayerManager IsPopup="True">
           <ContentPresenter Name="PART_ContentPresenter"
                             Background="{TemplateBinding Background}"
@@ -10,7 +11,7 @@
                             Content="{TemplateBinding Content}"
                             Padding="{TemplateBinding Padding}"/>
         </VisualLayerManager>
-      </Border>
+      </Panel>
     </ControlTemplate>
   </Setter>
 </Style>
diff --git a/src/Avalonia.Themes.Default/Window.xaml b/src/Avalonia.Themes.Default/Window.xaml
index e29409e894..0e7ec42856 100644
--- a/src/Avalonia.Themes.Default/Window.xaml
+++ b/src/Avalonia.Themes.Default/Window.xaml
@@ -4,7 +4,8 @@
   <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}"/>
   <Setter Property="Template">
     <ControlTemplate>
-      <Border Name="PART_TransparencyFallback">
+      <Panel>
+        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
         <Border Background="{TemplateBinding Background}">
           <VisualLayerManager>
             <ContentPresenter Name="PART_ContentPresenter"
@@ -15,7 +16,7 @@
                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
           </VisualLayerManager>
         </Border>
-      </Border>
+      </Panel>
     </ControlTemplate>
   </Setter>
 </Style>