diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
index 80dab984..904d7482 100644
--- a/.github/workflows/build_win.yml
+++ b/.github/workflows/build_win.yml
@@ -6,51 +6,8 @@ jobs:
   buildAssets:
     uses: ./.github/workflows/build_assets.yml
 
-  buildLauncherWin64:
-    runs-on: windows-latest
-    steps:
-      - name: Checkout Source
-        uses: actions/checkout@v4
-
-      - name: Build Launcher
-        id: build
-        run: |
-          Set-Location setup\windows
-          .\make.ps1
-
-      - name: Upload Unsigned Artifacts
-        id: upload-unsigned-artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: launcher
-          path: setup/windows/novelWriter.exe
-          if-no-files-found: error
-          retention-days: 14
-
-      - name: Submit Signing Request
-        uses: signpath/github-action-submit-signing-request@v1
-        with:
-          api-token: "${{ secrets.SIGNPATH_API_TOKEN }}"
-          organization-id: "0471e52c-66fa-4e9a-bfb9-36167095ca3f"
-          project-slug: "novelWriter"
-          signing-policy-slug: "release-signing"
-          artifact-configuration-slug: "launcher"
-          github-artifact-id: "${{ steps.upload-unsigned-artifact.outputs.artifact-id }}"
-          wait-for-completion: true
-          output-artifact-directory: "."
-
-      - name: Upload Signed Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: launcher-signed
-          path: novelWriter.exe
-          if-no-files-found: error
-          retention-days: 14
-
   buildWin64:
-    needs:
-      - buildAssets
-      - buildLauncherWin64
+    needs: buildAssets
     runs-on: windows-latest
     steps:
       - name: Python Setup
@@ -62,18 +19,12 @@ jobs:
       - name: Checkout Source
         uses: actions/checkout@v4
 
-      - name: Download Artifacts
+      - name: Download Assets
         uses: actions/download-artifact@v4
         with:
           name: nw-assets
           path: novelwriter/assets
 
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: launcher-signed
-          path: setup/windows
-
       - name: Build Setup Installer
         id: build
         run: |
diff --git a/.github/workflows/build_win_launcher.yml b/.github/workflows/build_win_launcher.yml
new file mode 100644
index 00000000..901f8a0d
--- /dev/null
+++ b/.github/workflows/build_win_launcher.yml
@@ -0,0 +1,45 @@
+name: BuildWindowsLauncher
+
+on: workflow_dispatch
+
+jobs:
+  buildLauncherWin64:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v4
+
+      - name: Build Launcher
+        id: build
+        run: |
+          Set-Location setup\windows
+          .\make.ps1
+
+      - name: Upload Unsigned Artifacts
+        id: upload-unsigned-artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: launcher
+          path: setup/windows/novelWriter.exe
+          if-no-files-found: error
+          retention-days: 14
+
+      - name: Submit Signing Request
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: "${{ secrets.SIGNPATH_API_TOKEN }}"
+          organization-id: "0471e52c-66fa-4e9a-bfb9-36167095ca3f"
+          project-slug: "novelWriter"
+          signing-policy-slug: "release-signing"
+          artifact-configuration-slug: "launcher"
+          github-artifact-id: "${{ steps.upload-unsigned-artifact.outputs.artifact-id }}"
+          wait-for-completion: true
+          output-artifact-directory: "."
+
+      - name: Upload Signed Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: launcher-signed
+          path: novelWriter.exe
+          if-no-files-found: error
+          retention-days: 14
diff --git a/setup/windows/novelWriter.exe b/setup/windows/novelWriter.exe
new file mode 100644
index 00000000..5026cddb
Binary files /dev/null and b/setup/windows/novelWriter.exe differ