diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index af1c26eb..70e3a6af 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -7,7 +7,7 @@ on:
       release:
         type: boolean
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.release }}
   cancel-in-progress: true
 name: Windows
 jobs:
@@ -27,15 +27,14 @@ jobs:
           msystem: mingw64
           update: true
           install: git make zip wget unzip mingw-w64-x86_64-meson mingw-w64-x86_64-gcc mingw-w64-x86_64-vala mingw-w64-x86_64-libsoup3 mingw-w64-x86_64-libxml2 mingw-w64-x86_64-gtksourceview5 mingw-w64-x86_64-webp-pixbuf-loader mingw-w64-x86_64-libadwaita mingw-w64-x86_64-libgee mingw-w64-x86_64-json-glib mingw-w64-x86_64-libsecret mingw-w64-x86_64-desktop-file-utils mingw-w64-x86_64-imagemagick mingw-w64-x86_64-icu mingw-w64-x86_64-libspelling mingw-w64-x86_64-gstreamer mingw-w64-x86_64-gst-plugins-base mingw-w64-x86_64-gst-plugins-good mingw-w64-x86_64-nsis
-      - run: make windows release=1
+      - run: make windows windows_nsis release=1
         if: ${{ inputs.release }}
-      - run: make windows
+      - run: make windows windows_nsis
         if: ${{ !inputs.release }}
       - uses: actions/upload-artifact@v4
         with:
           name: tuba_windows_portable
           path: tuba_windows_portable/
-      - run: make windows_nsis
       - uses: actions/upload-artifact@v4
         with:
           name: Tuba Setup.exe
diff --git a/build-aux/dev.geopjr.Tuba.nsi.in b/build-aux/dev.geopjr.Tuba.nsi.in
index 90f369a0..2aec753d 100644
--- a/build-aux/dev.geopjr.Tuba.nsi.in
+++ b/build-aux/dev.geopjr.Tuba.nsi.in
@@ -75,6 +75,7 @@
 		File "${EXEC_NAME}.ico"
 		WriteRegStr HKCU "Software\${NAME}" "" $INSTDIR
 
+		DeleteRegKey HKLM "${UNINSTALL_KEY}"
 		WriteRegStr HKLM "${UNINSTALL_KEY}" "DisplayName" "${NAME}"
 		WriteRegStr HKLM "${UNINSTALL_KEY}" "UninstallString" "$INSTDIR\uninstall.exe"
 		WriteRegStr HKLM "${UNINSTALL_KEY}" "InstallLocation" "$INSTDIR"