diff --git a/desktop-client/index.js b/desktop-client/index.js
index 94ddacd..a054e1b 100644
--- a/desktop-client/index.js
+++ b/desktop-client/index.js
@@ -26,6 +26,15 @@ async function createWindow() {
     },
   });
 
+  mainWindow.on('close', (e) => {
+    // Bypass beforeunload (YT Music sets one while audio is playing) so the
+    // window actually closes when the user clicks X or chooses Quit.
+    if (mainWindow && !mainWindow.isDestroyed()) {
+      e.preventDefault();
+      mainWindow.destroy();
+    }
+  });
+
   mainWindow.on('closed', () => {
     mainWindow = null;
   });