diff --git a/.github/workflows/electron.yml b/.github/workflows/electron-master.yml
similarity index 87%
rename from .github/workflows/electron.yml
rename to .github/workflows/electron-master.yml
index 717d197c79f..0fe0dd17025 100644
--- a/.github/workflows/electron.yml
+++ b/.github/workflows/electron-master.yml
@@ -11,11 +11,10 @@ on:
   push:
     branches:
       - master
-  pull_request:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
 
 jobs:
   build:
diff --git a/.github/workflows/electron-pr.yml b/.github/workflows/electron-pr.yml
new file mode 100644
index 00000000000..8a5f2a98682
--- /dev/null
+++ b/.github/workflows/electron-pr.yml
@@ -0,0 +1,43 @@
+name: Electron
+
+defaults:
+  run:
+    shell: bash
+
+env:
+  CI: true
+
+on:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - if: ${{ startsWith(matrix.os, 'windows') }}
+        run: pip.exe install setuptools
+      - if: ${{ ! startsWith(matrix.os, 'windows') }}
+        run: python3 -m pip install setuptools
+      - name: Set up environment
+        uses: ./.github/actions/setup
+      - name: Build Electron
+        run: ./bin/package-electron
+      - name: Upload Build
+        uses: actions/upload-artifact@v3
+        with:
+          name: actual-electron-${{ matrix.os }}
+          path: |
+            packages/desktop-electron/dist/*.dmg
+            packages/desktop-electron/dist/*.exe
+            packages/desktop-electron/dist/*.AppImage
diff --git a/upcoming-release-notes/2209.md b/upcoming-release-notes/2209.md
new file mode 100644
index 00000000000..2f7915f4ff0
--- /dev/null
+++ b/upcoming-release-notes/2209.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+electron: split the build script in 2x parts to fix it failing when no code signing cert is provided (PRs from forks).