diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index 2d6f14551b3..674eb41a503 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -98,6 +98,7 @@ function buildWin32Setup(arch, target) {
 			AppMutex: product.win32MutexName,
 			TunnelMutex: product.win32TunnelMutex,
 			TunnelServiceMutex: product.win32TunnelServiceMutex,
+			TunnelApplicationName: product.tunnelApplicationName,
 			ApplicationName: product.applicationName,
 			Arch: arch,
 			AppId: { 'ia32': ia32AppId, 'x64': x64AppId, 'arm64': arm64AppId }[arch],
diff --git a/build/win32/code.iss b/build/win32/code.iss
index 44c9f2f1f0b..b7336831374 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -1362,12 +1362,6 @@ begin
     end;
   end;
 
-  if IsNotBackgroundUpdate() and CheckForMutexes('{#TunnelMutex}') then
-  begin
-     MsgBox('{#NameShort} is still running a tunnel. Please stop the tunnel before installing.', mbInformation, MB_OK);
-		 Result := false
-  end;
-
 end;
 
 function WizardNotSilent(): Boolean;
@@ -1380,6 +1374,31 @@ end;
 var
 	ShouldRestartTunnelService: Boolean;
 
+function StopTunnelOtherProcesses(): Boolean;
+var
+	WaitCounter: Integer;
+	TaskKilled: Integer;
+begin
+	Log('Stopping all tunnel services (at ' + ExpandConstant('"{app}\bin\{#TunnelApplicationName}.exe"') + ')');
+	ShellExec('', 'powershell.exe', '-Command "Get-WmiObject Win32_Process | Where-Object { $_.ExecutablePath -eq ' + ExpandConstant('''{app}\bin\{#TunnelApplicationName}.exe''') + ' } | Select @{Name=''Id''; Expression={$_.ProcessId}} | Stop-Process -Force"', '', SW_HIDE, ewWaitUntilTerminated, TaskKilled)
+
+	WaitCounter := 10;
+	while (WaitCounter > 0) and CheckForMutexes('{#TunnelMutex}') do
+	begin
+		Log('Tunnel process is is still running, waiting');
+		Sleep(500);
+		WaitCounter := WaitCounter - 1
+	end;
+
+	if CheckForMutexes('{#TunnelMutex}') then
+		begin
+			Log('Unable to stop tunnel processes');
+			Result := False;
+		end
+	else
+		Result := True;
+end;
+
 procedure StopTunnelServiceIfNeeded();
 var
 	StopServiceResultCode: Integer;
@@ -1413,7 +1432,11 @@ function PrepareToInstall(var NeedsRestart: Boolean): String;
 begin
   if IsNotBackgroundUpdate() then
     StopTunnelServiceIfNeeded();
-  Result := ''
+
+  if IsNotBackgroundUpdate() and not StopTunnelOtherProcesses() then
+     Result := '{#NameShort} is still running a tunnel process. Please stop the tunnel before installing.'
+  else
+  	Result := '';
 end;
 
 // VS Code will create a flag file before the update starts (/update=C:\foo\bar)
@@ -1607,4 +1630,4 @@ begin
   #endif
 
   Exec(ExpandConstant('{sys}\icacls.exe'), ExpandConstant('"{app}" /inheritancelevel:r ') + Permissions, '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
-end;
\ No newline at end of file
+end;