diff --git a/.github/workflows/job-close-stale.yml b/.github/workflows/job-close-stale.yml
index 51cd7d339..ea67d8e96 100644
--- a/.github/workflows/job-close-stale.yml
+++ b/.github/workflows/job-close-stale.yml
@@ -121,4 +121,5 @@ jobs:
         with:
           actions: 'remove-labels'
           token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number || github.event.pull_request.number }}
           labels: '⚰️ Stale,🕸️ Inactive,🚏 Awaiting User Response,🛑 No Response'
diff --git a/.github/workflows/on-close-handler.yml b/.github/workflows/on-close-handler.yml
index cc0cd3292..39da98688 100644
--- a/.github/workflows/on-close-handler.yml
+++ b/.github/workflows/on-close-handler.yml
@@ -19,5 +19,5 @@ jobs:
         with:
           actions: remove-labels
           token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
+          issue-number: ${{ github.event.issue.number || github.event.pull_request.number }}
           labels: '🚏 Awaiting User Response,🧑‍💻 In Progress,📌 Keep Open,🚫 Merge Conflicts,🔬 Needs Testing,🔨 Needs Work,⚰️ Stale,⛔ Waiting For External/Upstream'