diff --git a/src/components/new-game/BreakOrderStep.tsx b/src/components/new-game/BreakOrderStep.tsx
index d170766..1567313 100644
--- a/src/components/new-game/BreakOrderStep.tsx
+++ b/src/components/new-game/BreakOrderStep.tsx
@@ -50,7 +50,15 @@ export const BreakOrderStep = ({ players, rule, onNext, onCancel, initialFirst =
       <div style={{ marginBottom: 16, fontWeight: 600 }}>Wer hat den ersten Anstoss?</div>
       <div style={{ display: 'flex', gap: 12, flexWrap: 'wrap' }}>
         {players.filter(Boolean).map((name, idx) => (
-          <button key={`first-${idx}`} type="button" className={styles['quick-pick-btn']} onClick={() => handleFirst(idx + 1)} aria-label={`Zuerst: ${name}`}>{name}</button>
+          <button
+            key={`first-${idx}`}
+            type="button"
+            className={`${styles['quick-pick-btn']} ${first === (idx + 1) ? styles['selected'] : ''}`}
+            onClick={() => handleFirst(idx + 1)}
+            aria-label={`Zuerst: ${name}`}
+          >
+            {name}
+          </button>
         ))}
       </div>
       {rule === 'wechselbreak' && playerCount === 3 && (
@@ -58,7 +66,15 @@ export const BreakOrderStep = ({ players, rule, onNext, onCancel, initialFirst =
           <div style={{ marginTop: 24, marginBottom: 16, fontWeight: 600 }}>Wer hat den zweiten Anstoss?</div>
           <div style={{ display: 'flex', gap: 12, flexWrap: 'wrap' }}>
             {players.filter(Boolean).map((name, idx) => (
-              <button key={`second-${idx}`} type="button" className={styles['quick-pick-btn']} onClick={() => handleSecond(idx + 1)} aria-label={`Zweites Break: ${name}`}>{name}</button>
+              <button
+                key={`second-${idx}`}
+                type="button"
+                className={`${styles['quick-pick-btn']} ${second === (idx + 1) ? styles['selected'] : ''}`}
+                onClick={() => handleSecond(idx + 1)}
+                aria-label={`Zweites Break: ${name}`}
+              >
+                {name}
+              </button>
             ))}
           </div>
         </>