diff --git a/Passepartout/App/Platforms/App+macOS.swift b/Passepartout/App/Platforms/App+macOS.swift
index 164b32d7..0657eac6 100644
--- a/Passepartout/App/Platforms/App+macOS.swift
+++ b/Passepartout/App/Platforms/App+macOS.swift
@@ -71,9 +71,11 @@ extension PassepartoutApp {
 
     @SceneBuilder
     var body: some Scene {
-        Window(appName, id: appName, content: contentView)
-            .defaultSize(width: 600, height: 400)
-            .withEnvironment(from: context, theme: theme)
+        Window(appName, id: appName) {
+            contentView()
+                .withEnvironment(from: context, theme: theme)
+        }
+        .defaultSize(width: 600, height: 400)
 
         Settings {
             SettingsView(profileManager: context.profileManager)