diff --git a/.github/workflows/create-cherry-pick-pr.yml b/.github/workflows/create-cherry-pick-pr.yml
index 21b2f8535bc5d9..8a2fdf029414a9 100644
--- a/.github/workflows/create-cherry-pick-pr.yml
+++ b/.github/workflows/create-cherry-pick-pr.yml
@@ -5,13 +5,20 @@ on:
       - 'next'
       - 'v*.x'
       - 'master'
-    types: ['closed']
+    types: ['closed', 'labeled']
 
 permissions: {}
 
 jobs:
   create_pr:
     name: Create cherry-pick PR
+    if: >-
+      ${{ github.event.pull_request.merged &&
+        contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && (
+          github.event.action == 'closed' ||
+          github.event.label.name == 'needs cherry-pick' ||
+          (startsWith(github.event.label.name, 'v') && endsWith(github.event.label.name, '.x'))
+        ) }}
     uses: mui/mui-public/.github/workflows/prs_create-cherry-pick-pr.yml@c6471a4fe98cb2e52efe7397ff8362569f2ddada # master
     permissions:
       contents: write