diff --git a/.claude/commands/review-local.md b/.claude/commands/review-local.md
index fefd52441f..902ff5106e 100644
--- a/.claude/commands/review-local.md
+++ b/.claude/commands/review-local.md
@@ -56,6 +56,11 @@ Compare what the code *actually does* (from Phase 2) against what it *should do*
 - Are there other places in the codebase that should have been updated alongside this change?
 - Are tests updated to cover the new behavior?
 
+## Phase 6: Accessibility
+
+- Are there missing labels, empty buttons, missing alt text, missing or inappropriate tab indexes, or other problems that make the new functionality 
+not accessible to all users and prevent us from being WCAG 2.2 A and AA compliant?
+
 ---
 
 ## Output Format
@@ -67,4 +72,4 @@ For each issue found, report:
 > **Why it matters**: The impact if unfixed.
 > **Suggestion**: How to fix it.
 
-Lead with Critical and High severity issues. After all issues, give a one-paragraph overall assessment.
\ No newline at end of file
+Lead with Critical and High severity issues. After all issues, give a one-paragraph overall assessment.
diff --git a/.claude/commands/review-pr.md b/.claude/commands/review-pr.md
index a9591706f8..542898e16e 100644
--- a/.claude/commands/review-pr.md
+++ b/.claude/commands/review-pr.md
@@ -47,6 +47,11 @@ Compare what the code *actually does* (from Phase 2) against what it *should do*
 - Are there other places in the codebase that should have been updated alongside this change?
 - Are tests updated to cover the new behavior?
 
+## Phase 6: Accessibility 
+
+- Are there missing labels, empty buttons, missing alt text, missing or inappropriate tab indexes, or other problems that make the new functionality
+  not accessible to all users and prevent us from being WCAG 2.2 A and AA compliant?
+
 ---
 
 ## Output Format
@@ -58,4 +63,4 @@ For each issue found, report:
 > **Why it matters**: The impact if unfixed.
 > **Suggestion**: How to fix it.
 
-Lead with Critical and High severity issues. After all issues, give a one-paragraph overall assessment.
\ No newline at end of file
+Lead with Critical and High severity issues. After all issues, give a one-paragraph overall assessment.
diff --git a/.claude/skills/wcag-compliance/wcag-22-checklist.md b/.claude/skills/wcag-compliance/wcag-22-checklist.md
index bdba73d77e..40700549fd 100644
--- a/.claude/skills/wcag-compliance/wcag-22-checklist.md
+++ b/.claude/skills/wcag-compliance/wcag-22-checklist.md
@@ -193,6 +193,7 @@ These patterns are common in the LabKey codebase and deserve extra attention:
 - Check `Modal`/`ModalDialog` components trap focus and are dismissible via Escape.
 - Ensure `Grid`/`QueryGrid` table components use proper `<table>` semantics with headers.
 - Check custom dropdown/select components for keyboard navigation (arrow keys, Escape, Enter).
+- Ensure tags other than buttons that have an `onClick` include an `onKeyDown` handler
 
 ### JSP Pages
 - Verify `<labkey:form>` and `<labkey:input>` render with proper label associations.
@@ -200,4 +201,4 @@ These patterns are common in the LabKey codebase and deserve extra attention:
 
 ### ExtJS Components
 - ExtJS components often lack accessibility. Flag custom ExtJS widgets that have no ARIA markup.
-- Verify ExtJS modals/windows are keyboard dismissible.
\ No newline at end of file
+- Verify ExtJS modals/windows are keyboard dismissible.