diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index 80ee230..d6be5b7 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -51,14 +51,17 @@ jobs:
 
   pr-review:
     concurrency:
-      group: claude-pr-review-${{ github.event.pull_request.number }}
+      group: claude-pr-review-${{ github.event.pull_request.number || github.event.issue.number }}
       cancel-in-progress: false
     if: |
-      github.event_name == 'pull_request' &&
-      (github.event.action == 'opened' ||
-       github.event.action == 'synchronize' ||
-       github.event.action == 'ready_for_review' ||
-       github.event.action == 'reopened')
+      (github.event_name == 'pull_request' &&
+       (github.event.action == 'opened' ||
+        github.event.action == 'synchronize' ||
+        github.event.action == 'ready_for_review' ||
+        github.event.action == 'reopened')) ||
+      (github.event_name == 'issue_comment' &&
+       github.event.issue.pull_request != null &&
+       github.event.comment.user.login != 'mega-maxwell[bot]')
     runs-on: ubuntu-24.04
     timeout-minutes: 30
     permissions:
@@ -80,6 +83,7 @@ jobs:
 
       - uses: actions/checkout@v4
         with:
+          ref: ${{ github.event_name == 'issue_comment' && format('refs/pull/{0}/head', github.event.issue.number) || '' }}
           token: ${{ steps.app-token.outputs.token }}
           persist-credentials: false
           submodules: recursive