diff --git a/src/server/process/WindowsProcess.ts b/src/server/process/WindowsProcess.ts
index 7e1ee65..02563d7 100644
--- a/src/server/process/WindowsProcess.ts
+++ b/src/server/process/WindowsProcess.ts
@@ -78,8 +78,8 @@ export class WindowsProcess implements OpenCodeProcess {
     }
 
     // Register beforeunload handler for window close cleanup
-    // Skip in test environment to avoid interfering with test lifecycle
-    if (typeof window !== "undefined" && !process.env.VITEST) {
+    // Skip in CI/test environments to avoid interfering with test lifecycle
+    if (typeof window !== "undefined" && !process.env.CI) {
       window.addEventListener("beforeunload", () => {
         if (WindowsProcess.currentProcess?.pid) {
           WindowsProcess.killProcessSync(WindowsProcess.currentProcess.pid);