diff --git a/src/UniGetUI/MainWindow.xaml.cs b/src/UniGetUI/MainWindow.xaml.cs
index 20bfb5cf0..160b6e996 100644
--- a/src/UniGetUI/MainWindow.xaml.cs
+++ b/src/UniGetUI/MainWindow.xaml.cs
@@ -60,6 +60,7 @@ public MainWindow()
             ExtendsContentIntoTitleBar = true;
             AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
             SetTitleBar(MainContentGrid);
+            MainContentGrid.ActualThemeChanged += (_, _) => ApplyTitleBarButtonColors();
             AppWindow.SetIcon(
                 Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Images", "icon.ico")
             );
@@ -726,6 +727,11 @@ public void ApplyTheme()
                 MainContentGrid.RequestedTheme = ElementTheme.Default;
             }
 
+            ApplyTitleBarButtonColors();
+        }
+
+        private void ApplyTitleBarButtonColors()
+        {
             if (AppWindowTitleBar.IsCustomizationSupported())
             {
                 if (MainApp.Instance.ThemeListener.CurrentTheme == ApplicationTheme.Light)