diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 219187cf..c08922e1 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -30,6 +30,10 @@
 
   <Style Selector="Window[WindowState=Maximized]">
     <Setter Property="BorderThickness" Value="0"/>
+    <Setter Property="Padding" Value="0"/>
+  </Style>
+  
+  <Style Selector="Window[WindowState=Maximized].fix_maximized_padding">
     <Setter Property="Padding" Value="6"/>
   </Style>
 
diff --git a/src/Views/ChromelessWindow.cs b/src/Views/ChromelessWindow.cs
index 14501eba..7c4178c2 100644
--- a/src/Views/ChromelessWindow.cs
+++ b/src/Views/ChromelessWindow.cs
@@ -14,6 +14,8 @@ namespace SourceGit.Views
         {
             if (OperatingSystem.IsLinux())
                 Classes.Add("custom_window_frame");
+            else if (OperatingSystem.IsWindows())
+                Classes.Add("fix_maximized_padding");
         }
 
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)