diff --git a/CLIENT_DATA/browserkill.vbs b/CLIENT_DATA/browserkill.vbs
new file mode 100644
index 0000000..d7a69ea
--- /dev/null
+++ b/CLIENT_DATA/browserkill.vbs
@@ -0,0 +1,33 @@
+Option Explicit
+KillBrowsers()
+
+Sub KillBrowsers()
+'Declare variables
+    Dim i
+    Dim wmiSvc,WQL,Processes,Process
+    Dim arrBrowserProcesses(7)
+
+'Initialize variables
+    arrBrowserProcesses(0)="iexplore.exe"
+    arrBrowserProcesses(1)="chrome.exe"
+    arrBrowserProcesses(2)="firefox.exe"
+    arrBrowserProcesses(3)="safari.exe"
+    arrBrowserProcesses(4)="opera.exe"
+    arrBrowserProcesses(5)="iron.exe"
+    arrBrowserProcesses(6)="MicrosoftEdge.exe"
+
+    Set wmiSvc = GetObject("winmgmts:\\.\root\cimv2")
+    For i = 0 To UBound(arrBrowserProcesses)
+	wql = "SELECT * FROM Win32_Process WHERE Name='" & arrBrowserProcesses(i) & "'"
+	Set processes = wmiSvc.ExecQuery(wql)
+	Do While processes.Count > 0
+	    For Each process In processes
+		process.Terminate
+	    Next
+	    WScript.Sleep 200
+	    Set processes = wmiSvc.ExecQuery(wql)
+	Loop
+    Next
+
+End Sub
+
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 9ea1dd6..8c6c8be 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -64,6 +64,9 @@ else
 	Winbatch_install
 	Sub_check_exitcode
 	
+	comment "Close the After Install browser window"
+	Winbatch_taskkill
+
 	comment "Copy files"
 	Files_install /32Bit
 	
@@ -75,18 +78,12 @@ else
 	
 endif
 
-comment "Close the After Install browser window"
-sleepSeconds 3
-killtask "iexplore.exe"
-killtask "iron.exe"
-killtask "firefox.exe"
-killtask "chrome.exe"
-killtask "opera.exe"
-
-
 [Winbatch_install]
 "$InstallExe$" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES /NOCANDY
 
+[Winbatch_taskkill]
+cscript //b //nologo %ScriptPath%\browserkill.vbs
+
 [Files_install]
 ; copy the ini file to the InstallDir
 copy "$IniCfgFile$" "$InstallDir$"