diff --git a/integration/helpers/utils.ts b/integration/helpers/utils.ts
index 55395f84e3..ab342ac1d6 100644
--- a/integration/helpers/utils.ts
+++ b/integration/helpers/utils.ts
@@ -13,7 +13,6 @@ export function setup(): Application {
     path: AppPaths[process.platform],
     startTimeout: 30000,
     waitTimeout: 60000,
-    chromeDriverArgs: ['remote-debugging-port=9222'],
     env: {
       CICD: "true"
     }
@@ -22,10 +21,12 @@ export function setup(): Application {
 
 export async function tearDown(app: Application) {
   const pid = app.mainProcess.pid
+  let ppid: any = pid
+  ppid = await ppid()
   await app.stop()
   try {
-    process.kill(pid, 0);
+    process.kill(ppid, "SIGKILL");
   } catch (e) {
-    return
+    console.error(e)
   }
 }
diff --git a/src/main/index.ts b/src/main/index.ts
index 35475e84d5..7e7595c7e3 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -87,12 +87,11 @@ app.on("activate", (event, hasVisibleWindows) => {
 app.on("will-quit", (event) => {
   logger.info('APP:QUIT');
   event.preventDefault(); // prevent app's default shutdown (e.g. required for telemetry, etc.)
-
+  clusterManager?.stop();
   if (userStore.preferences.trayEnabled) {
     return; // with tray the app remains open
   } else {
     windowManager?.destroy();
-    clusterManager?.stop();
     proxyServer?.close();
     app.exit(); // forced app.quit()
   }
diff --git a/src/main/window-manager.ts b/src/main/window-manager.ts
index c0b6bba2db..f6a7466c49 100644
--- a/src/main/window-manager.ts
+++ b/src/main/window-manager.ts
@@ -68,7 +68,7 @@ export class WindowManager {
       if (showSplash) await this.showSplash();
       await this.mainWindow.loadURL(this.mainUrl);
       this.mainWindow.show();
-      this.splashWindow?.hide();
+      this.splashWindow?.close();
     } catch (err) {
       dialog.showErrorBox("ERROR!", err.toString())
     }