diff --git a/lib/components/Shared/PageWindowTitleBar.dart b/lib/components/Shared/PageWindowTitleBar.dart
index 9f139b8b0..df4a0350b 100644
--- a/lib/components/Shared/PageWindowTitleBar.dart
+++ b/lib/components/Shared/PageWindowTitleBar.dart
@@ -123,8 +123,7 @@ class PageWindowTitleBar extends StatelessWidget
               ),
             if (leading != null) leading!,
             Expanded(child: MoveWindow(child: Center(child: center))),
-            if (!kIsMacOS && !kIsMobile)
-              TitleBarActionButtons(color: foregroundColor)
+            if (!kIsMacOS && !kIsMobile) const PlatformWindowButtons()
           ],
         ),
       ),
diff --git a/lib/main.dart b/lib/main.dart
index 08fb65e58..4939a7b54 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -235,6 +235,13 @@ class SpotubeState extends ConsumerState<Spotube> with WidgetsBindingObserver {
       macosTheme: macosTheme,
       macosDarkTheme: macosDarkTheme,
       themeMode: themeMode,
+      windowButtonConfig: PlatformWindowButtonConfig(
+        isMaximized: appWindow.isMaximized,
+        onClose: appWindow.close,
+        onRestore: appWindow.restore,
+        onMaximize: appWindow.maximize,
+        onMinimize: appWindow.minimize,
+      ),
       shortcuts: PlatformProperty.all({
         ...WidgetsApp.defaultShortcuts.map((key, value) {
           return MapEntry(