diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml
index 5a38aa8c..ff1b11f7 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Window.xaml
@@ -160,6 +160,9 @@
                             <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}"/>
                             <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}"/>
                         </Trigger>
+                        <Trigger Property="WindowStyle" Value="None">
+                            <Setter Property="ShowNonClientArea" Value="False"/>
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="ResizeMode" Value="CanResizeWithGrip"/>
@@ -239,4 +242,4 @@
         </Style.Triggers>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>