diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5c13a228fd7..897ca100d61 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 10
-          command: choco install --no-progress nsis.portable --version 3.02 -y
+          command: choco install --no-progress nsis.portable --version 3.09 -y
 
       - name: choco install things
         shell: pwsh
@@ -143,7 +143,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 10
-          command: choco install --no-progress nsis.portable --version 3.02 -y
+          command: choco install --no-progress nsis.portable --version 3.09 -y
 
       - name: choco install things
         shell: pwsh
diff --git a/extra/EnvVarUpdate.nsh b/extra/EnvVarUpdate.nsh
index 39682000c35..5794a0d270c 100644
--- a/extra/EnvVarUpdate.nsh
+++ b/extra/EnvVarUpdate.nsh
@@ -43,7 +43,7 @@
   !ifndef Un${StrFuncName}_INCLUDED
     ${Un${StrFuncName}}
   !endif
-  !define un.${StrFuncName} "${Un${StrFuncName}}"
+  !define un.${StrFuncName} '${Un${StrFuncName}}'
 !macroend
 
 !insertmacro _IncludeStrFunction StrTok
diff --git a/extra/github-actions/install-nsis.yml b/extra/github-actions/install-nsis.yml
index 752016d080e..5c77f1c978d 100644
--- a/extra/github-actions/install-nsis.yml
+++ b/extra/github-actions/install-nsis.yml
@@ -3,7 +3,7 @@
   with:
     timeout_minutes: 10
     max_attempts: 10
-    command: choco install --no-progress nsis.portable --version 3.02 -y
+    command: choco install --no-progress nsis.portable --version 3.09 -y
 
 - name: choco install things
   shell: pwsh