diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 7c63c636e..dcbc9d008 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -56,7 +56,7 @@ jobs:
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           workingDir: ./frontend
-      - name: Create or update Storybook comment on PR
+      - name: Create Storybook comment (initial)
         if: github.event_name == 'pull_request'
         uses: peter-evans/create-or-update-comment@v4
         with:
@@ -64,6 +64,43 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             A Storybook preview is available for commit ${{ github.sha }}.
-            [View Storybook](${{ steps.chromatic.outputs.storybookUrl }})
-            [View Chromatic build](${{ steps.chromatic.outputs.buildUrl }})
+            ➡️ [View Storybook](${{ steps.chromatic.outputs.storybookUrl }})
+            ➡️ [View Chromatic build](${{ steps.chromatic.outputs.buildUrl }})
+          edit-mode: replace
+      - name: Create Storybook comment (no changes)
+        if:
+          github.event_name == 'pull_request' &&
+          steps.chromatic.outputs.changeCount == 0
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.cc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ✅ Captured ${{ steps.chromatic.outputs.actualCaptureCount }} snapshots. No changes detected.
+          edit-mode: append
+      - name: Create Storybook comment (with changes)
+        if:
+          github.event_name == 'pull_request' &&
+          steps.chromatic.outputs.changeCount > 0
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.cc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          # prettier-ignore
+          body: >
+            🔍 ${{ steps.chromatic.outputs.changeCount }} out of
+            ${{ steps.chromatic.outputs.actualCaptureCount }} snapshots have changed.
+            Please review the changes before merging.
+          edit-mode: append
+      - name: Create Storybook comment (failure)
+        # prettier-ignore
+        if:
+          always() && github.event_name == 'pull_request' && steps.chromatic.outcome == 'failure'
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.cc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            The Storybook preview generation failed for commit ${{ github.sha }}.
+            Check the log output of the GitHub action for more information.
           edit-mode: replace