diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index b83da712e..432f5cae7 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -3,7 +3,7 @@ name: Build (Android)
 on: [push, pull_request]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
index 2605e9beb..9021338cd 100644
--- a/.github/workflows/emscripten.yml
+++ b/.github/workflows/emscripten.yml
@@ -3,7 +3,7 @@ name: Build (Emscripten)
 on: [push, pull_request]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index fb92ecd18..af6e08055 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -3,7 +3,7 @@ name: Build (iOS/tvOS)
 on: [push, pull_request]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5cc488982..5261d77f1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: Build
 on: [push, pull_request]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
index 0abfc50f5..254ab47fa 100644
--- a/.github/workflows/msvc.yml
+++ b/.github/workflows/msvc.yml
@@ -3,7 +3,7 @@ name: Build (MSVC)
 on: [push, pull_request]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/n3ds.yml b/.github/workflows/n3ds.yml
index 9b11122f3..ac8f129e5 100644
--- a/.github/workflows/n3ds.yml
+++ b/.github/workflows/n3ds.yml
@@ -3,7 +3,7 @@ name: Build (Nintendo 3DS)
 on: [push, pull_request]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/riscos.yml b/.github/workflows/riscos.yml
index d3ecc68b2..6b2695065 100644
--- a/.github/workflows/riscos.yml
+++ b/.github/workflows/riscos.yml
@@ -3,7 +3,7 @@ name: Build (RISC OS)
 on: [push, pull_request]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/vmactions.yml b/.github/workflows/vmactions.yml
index a86cf1b35..ee1998b40 100644
--- a/.github/workflows/vmactions.yml
+++ b/.github/workflows/vmactions.yml
@@ -3,7 +3,7 @@ name: Build (VM Actions)
 on: [push, pull_request]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.issue.number || github.run_id }}
   cancel-in-progress: true
 
 jobs: