diff --git a/app/main.ts b/app/main.ts
index c0da7d5992..6a14d59f3a 100644
--- a/app/main.ts
+++ b/app/main.ts
@@ -844,6 +844,8 @@ async function createWindow() {
 
   mainWindow.on('resize', captureWindowStats);
   mainWindow.on('move', captureWindowStats);
+  mainWindow.on('maximize', captureWindowStats);
+  mainWindow.on('unmaximize', captureWindowStats);
 
   if (!ciMode && config.get<boolean>('openDevTools')) {
     // Open the DevTools.
@@ -950,6 +952,9 @@ async function createWindow() {
       return;
     }
 
+    // Persist pending window settings to ephemeralConfig
+    debouncedSaveStats.flush();
+
     windowState.markRequestedShutdown();
     await requestShutdown();
     windowState.markReadyForShutdown();