diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 1c15db229e..53748f0206 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -112,7 +112,6 @@ atlstr
 Attribs
 attrs
 Atyrau
-augustkarlstedt
 aumid
 Aut
 Authenticode
@@ -144,7 +143,6 @@ bck
 Belarus
 betadele
 betsegaw
-bezgumption
 BGR
 bgra
 bhid
@@ -540,6 +538,7 @@ eltociear
 emmintrin
 Emoji
 emptyrecyclebin
+ENABLEDELAYEDEXPANSION
 ENABLEDPOPUP
 endforeach
 endian
@@ -560,6 +559,7 @@ ERASEBKGND
 EREOF
 EResize
 ERole
+ERRORLEVEL
 ERRORMESSAGE
 ERRORTITLE
 ESettings
@@ -1352,6 +1352,7 @@ NDEBUG
 Ndombe
 ndp
 NEEDDISPATCH
+NEQ
 NESW
 netcore
 netcoreapp
@@ -1470,7 +1471,6 @@ openxmlformats
 OPTIMIZEFORINVOKE
 ORAW
 ORPHANEDDIALOGTITLE
-osfanbuff
 oss
 ostr
 ostream
@@ -1752,7 +1752,6 @@ RNumber
 roadmap
 robmensching
 Roboto
-rohanrdy
 rooler
 roslyn
 Rothera
diff --git a/installer/PowerToysSetup/PowerToys.wxs b/installer/PowerToysSetup/PowerToys.wxs
index fc4447663c..6ea5f5090a 100644
--- a/installer/PowerToysSetup/PowerToys.wxs
+++ b/installer/PowerToysSetup/PowerToys.wxs
@@ -72,6 +72,16 @@
       <util:RegistrySearch Variable="DetectedVCRedistVersion" Root="HKLM" Key="Software\Microsoft\VisualStudio\14.0\VC\Runtimes\$(var.PowerToysPlatform)" Value="Minor" Result="value" Format="raw" />
 
         <Chain>
+            <ExePackage
+                Name="terminate_powertoys.cmd"
+                Cache="no"
+                Compressed="yes"
+                Id="TerminatePowerToys"
+                SourceFile="terminate_powertoys.cmd"
+                Permanent="yes"
+                PerMachine="yes"
+                Vital="no">
+            </ExePackage>
             <ExePackage
                 Name="windowsdesktop-runtime-6.0.8-win-$(var.PowerToysPlatform).exe"
                 Compressed="no"
diff --git a/installer/PowerToysSetup/terminate_powertoys.cmd b/installer/PowerToysSetup/terminate_powertoys.cmd
new file mode 100644
index 0000000000..8206b90aae
--- /dev/null
+++ b/installer/PowerToysSetup/terminate_powertoys.cmd
@@ -0,0 +1,12 @@
+@echo off
+setlocal ENABLEDELAYEDEXPANSION
+
+@REM We loop here until taskkill cannot find a PowerToys process. We can't use /F flag, because it
+@REM doesn't give application an opportunity to cleanup. Thus we send WM_CLOSE which is being caught
+@REM by multiple windows running a msg loop in PowerToys.exe process, which we close one by one.
+for /l %%x in (1, 1, 100) do (
+    taskkill /IM PowerToys.exe 1>NUL 2>NUL
+    if !ERRORLEVEL! NEQ 0 goto quit
+)
+
+:quit
\ No newline at end of file