diff --git a/.github/workflows/spotless-check.yml b/.github/workflows/spotless-check.yml
index aece2ab..3c4f76a 100644
--- a/.github/workflows/spotless-check.yml
+++ b/.github/workflows/spotless-check.yml
@@ -4,12 +4,18 @@ on:
   pull_request:
     branches:
       - 1.21
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
   push:
     branches:
       - 1.21
 
 jobs:
   spotless-check:
+    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
     runs-on: ubuntu-latest
 
     env: