diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
index 0062e7d6d7..61d3ff4d7a 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
@@ -908,7 +908,8 @@
                         </Panel>
                     </Button>
                     <!-- Close: X -->
-                    <Button Width="46" Height="44"
+                    <Button x:Name="CaptionCloseButton"
+                            Width="46" Height="44"
                             Classes="caption caption-close"
                                                         automation:AutomationProperties.Name="{t:Translate Close}"
                             ToolTip.Tip="{t:Translate Close}"
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
index db4e357eb8..f8b36c3c9d 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
@@ -1414,7 +1414,8 @@ private void UpdateCaptionButtonInset()
                 inset = frame.Right / (dpi / 96.0);
         }
 
-        WindowButtons.Margin = new Thickness(0, 0, inset, 0);
+        CaptionCloseButton.Width = 46 + inset;
+        CaptionCloseButton.Padding = new Thickness(0, 0, inset, 0);
     }
 
     private void ApplyWindowBorderColor(nint handle)