diff --git a/MahApps.Metro/Themes/WindowButtonCommands.xaml b/MahApps.Metro/Themes/WindowButtonCommands.xaml
index 1957869035..bda929ca48 100644
--- a/MahApps.Metro/Themes/WindowButtonCommands.xaml
+++ b/MahApps.Metro/Themes/WindowButtonCommands.xaml
@@ -61,8 +61,7 @@
                       SnapsToDevicePixels="True"
                       Fill="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}" />
             </Button>
-            <!--Style="{Binding CloseButtonStyle, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type Controls:WindowButtonCommands}}}"-->
-
+            
             <Button x:Name="PART_Close"
                     Focusable="False"
                     RenderOptions.EdgeMode="Aliased"
diff --git a/MahApps.Metro/Themes/WindowCommands.xaml b/MahApps.Metro/Themes/WindowCommands.xaml
index a1b6e38eba..ffc5739fef 100644
--- a/MahApps.Metro/Themes/WindowCommands.xaml
+++ b/MahApps.Metro/Themes/WindowCommands.xaml
@@ -213,6 +213,18 @@
                                                SnapsToDevicePixels="True"
                                                Opacity="0.25" />
                                 </StackPanel>
+                                <ControlTemplate.Triggers>
+                                    <DataTrigger Binding="{Binding ElementName=PART_ContentPresenter, Path=Content.Visibility}"
+                                                 Value="Collapsed">
+                                        <Setter Property="Visibility"
+                                                Value="Collapsed" />
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding ElementName=PART_ContentPresenter, Path=Content.Visibility}"
+                                                 Value="Hidden">
+                                        <Setter Property="Visibility"
+                                                Value="Collapsed" />
+                                    </DataTrigger>
+                                </ControlTemplate.Triggers>
                             </ControlTemplate>
                         </Setter.Value>
                     </Setter>