diff --git a/components/backlog/pbi-list.tsx b/components/backlog/pbi-list.tsx
index 45b01b7..a749228 100644
--- a/components/backlog/pbi-list.tsx
+++ b/components/backlog/pbi-list.tsx
@@ -124,7 +124,6 @@ function SortablePbiRow({
   }
 
   if (selectionMode) {
-    const isChecked = triState !== 'empty'
     return (
       <BacklogCard
         ref={setNodeRef}
@@ -132,24 +131,39 @@ function SortablePbiRow({
         title={pbi.title}
         code={pbi.code}
         priority={pbi.priority}
-        isSelected={isChecked}
+        isSelected={isSelected}
         role="button"
         tabIndex={0}
-        aria-pressed={isChecked}
-        onClick={onToggleCheck}
-        onKeyDown={(e: React.KeyboardEvent) => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); onToggleCheck() } }}
+        aria-pressed={isSelected}
+        onClick={onSelect}
+        onKeyDown={(e: React.KeyboardEvent) => {
+          if (e.key === 'Enter' || e.key === ' ') {
+            e.preventDefault()
+            onSelect()
+          }
+        }}
         badge={
           <Badge className={cn('text-xs font-normal', PBI_STATUS_COLORS[pbi.status])}>
             {PBI_STATUS_LABELS[pbi.status]}
           </Badge>
         }
         actions={
-          <div
-            className="inline-flex items-center justify-center min-h-7 min-w-7 text-muted-foreground"
-            aria-hidden="true"
+          <button
+            type="button"
+            onClick={(e) => {
+              e.stopPropagation()
+              onToggleCheck()
+            }}
+            aria-pressed={triState !== 'empty'}
+            aria-label={
+              triState === 'full'
+                ? 'Stories uit sprint halen'
+                : 'Stories aan sprint toevoegen'
+            }
+            className="inline-flex items-center justify-center min-h-7 min-w-7 text-muted-foreground hover:text-foreground rounded transition-colors"
           >
             <TriStateIcon state={triState} />
-          </div>
+          </button>
         }
       />
     )