diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index b110451421..157df05030 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -66,20 +66,20 @@
       <v:CustomNotificationView />
     </DataTemplate>
   </Window.DataTemplates>
-  <Panel>  
+  <Panel>
     <Panel Margin="{Binding #MainWindow.OffScreenMargin}">
       <DockPanel LastChildFill="True" Margin="{Binding #MainWindow.WindowDecorationMargins}">
-      <Menu Name="MainMenu" DockPanel.Dock="Top">
-        <MenuItem Header="File">
-          <MenuItem Header="Exit" Command="{Binding ExitCommand}" />
-        </MenuItem>
-        <MenuItem Header="Help">
-          <MenuItem Header="About" Command="{Binding AboutCommand}" />
-        </MenuItem>
-      </Menu>
-      <local:MainView />
-    </DockPanel>
-    </Panel>    
+        <Menu Name="MainMenu" DockPanel.Dock="Top">
+          <MenuItem Header="File">
+            <MenuItem Header="Exit" Command="{Binding ExitCommand}" />
+          </MenuItem>
+          <MenuItem Header="Help">
+            <MenuItem Header="About" Command="{Binding AboutCommand}" />
+          </MenuItem>
+        </Menu>
+        <local:MainView />
+      </DockPanel>
+    </Panel>
     <Border IsVisible="{Binding ExtendClientAreaEnabled}" BorderThickness="1 1 1 0" CornerRadius="4 4 0 0" BorderBrush="#55000000" Height="22" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="250 8 0 0">
       <Border.Background>
         <SolidColorBrush Color="White" Opacity="0.7" />
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index b3ea25e470..5e9b02db06 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -70,11 +70,6 @@ namespace ControlCatalog.ViewModels
                 {
                     ChromeHints = ExtendClientAreaChromeHints.NoChrome;
 
-                    if(x.Item1)
-                    {
-                        ChromeHints |= ExtendClientAreaChromeHints.SystemChromeButtons;
-                    }
-
                     if(x.Item2)
                     {
                         ChromeHints |= ExtendClientAreaChromeHints.ManagedChromeButtons;
diff --git a/src/Avalonia.Themes.Default/Window.xaml b/src/Avalonia.Themes.Default/Window.xaml
index 09fec62d02..fa82b760ba 100644
--- a/src/Avalonia.Themes.Default/Window.xaml
+++ b/src/Avalonia.Themes.Default/Window.xaml
@@ -5,7 +5,9 @@
   <Setter Property="Template">
     <ControlTemplate>
       <Panel>
-        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" Margin="{TemplateBinding WindowDecorationMargins}" />
+        <Panel IsHitTestVisible="False" Margin="{TemplateBinding OffScreenMargin}">
+          <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" Margin="{TemplateBinding WindowDecorationMargins}" />
+        </Panel>
         <Border Background="{TemplateBinding Background}">
           <VisualLayerManager>
             <ContentPresenter Name="PART_ContentPresenter"