diff --git a/resources/js/components/commit-card.tsx b/resources/js/components/commit-card.tsx
index 7005edc83..2a10c2436 100644
--- a/resources/js/components/commit-card.tsx
+++ b/resources/js/components/commit-card.tsx
@@ -481,6 +481,7 @@ export function CommitCard({
                                     <div className="flex flex-wrap items-center gap-0.5">
                                         <CommitStarButton
                                             commit={commit}
+                                            keyShortcut="s"
                                             className="px-2 py-0.5"
                                         />
                                         <CommitPastelButton
@@ -503,6 +504,7 @@ export function CommitCard({
                                         <>
                                             <CommitStarButton
                                                 commit={commit}
+                                                keyShortcut="s"
                                                 className="px-2 py-0.5"
                                             />
                                             <CommitPastelButton
diff --git a/resources/js/components/commit-star-button.tsx b/resources/js/components/commit-star-button.tsx
index 8074a6f6b..2b10c9439 100644
--- a/resources/js/components/commit-star-button.tsx
+++ b/resources/js/components/commit-star-button.tsx
@@ -30,9 +30,11 @@ function starLabel(starred: boolean, count: number): string {
 
 export function CommitStarButton({
     commit,
+    keyShortcut,
     className,
 }: {
     commit: Commit;
+    keyShortcut?: string;
     className?: string;
 }) {
     const { auth } = usePage().props;
@@ -140,7 +142,10 @@ export function CommitStarButton({
 
     return (
         <>
-            <ActionTooltip label={starred ? 'Unstar' : 'Star'}>
+            <ActionTooltip
+                label={starred ? 'Unstar' : 'Star'}
+                shortcut={keyShortcut}
+            >
                 <button
                     ref={setElement}
                     aria-disabled={request.processing}
@@ -148,6 +153,7 @@ export function CommitStarButton({
                     onClick={toggle}
                     aria-pressed={starred}
                     aria-label={starLabel(starred, count)}
+                    aria-keyshortcuts={keyShortcut}
                     className={cn(
                         'group/star inline-flex items-center gap-1 rounded-md px-1.5 py-1 font-mono text-[13px] text-muted-foreground transition-colors hover:bg-accent hover:text-foreground',
                         starred && 'text-primary hover:text-primary',
diff --git a/resources/js/components/keyboard-shortcuts-dialog.tsx b/resources/js/components/keyboard-shortcuts-dialog.tsx
index 25332e266..3b2f9837b 100644
--- a/resources/js/components/keyboard-shortcuts-dialog.tsx
+++ b/resources/js/components/keyboard-shortcuts-dialog.tsx
@@ -12,6 +12,7 @@ type Shortcut = { keys: string[]; label: string };
 const shortcuts = (keys: KeyLabels): Shortcut[] => [
     { keys: ['j'], label: 'Next commit' },
     { keys: ['k'], label: 'Previous commit' },
+    { keys: ['s'], label: 'Star or unstar the focused commit' },
     { keys: ['y'], label: 'Copy link to the focused commit' },
     { keys: ['↵'], label: 'Open the focused commit' },
     { keys: ['r'], label: 'Reply to commit' },