diff --git a/src/components/HUD/BassScreen.tsx b/src/components/HUD/BassScreen.tsx
index 679d2e28..b05e2663 100644
--- a/src/components/HUD/BassScreen.tsx
+++ b/src/components/HUD/BassScreen.tsx
@@ -153,8 +153,17 @@ export const BassScreen: React.FC = () => {
                         {store.pattern.map((step, i) => (
                             <button
                                 key={i}
+                                role="switch"
+                                aria-checked={!!step?.active}
+                                aria-label={`Step ${i + 1}`}
                                 className={`pattern-step ${step?.active ? 'active' : ''}`}
                                 onClick={() => toggleStepParam(i, 'active')}
+                                onKeyDown={(e) => {
+                                    if (e.key === 'Enter' || e.key === ' ') {
+                                        e.preventDefault()
+                                        toggleStepParam(i, 'active')
+                                    }
+                                }}
                             />
                         ))}
                     </div>
diff --git a/src/components/HUD/DrumsScreen.tsx b/src/components/HUD/DrumsScreen.tsx
index 1ecf3060..5ec4d906 100644
--- a/src/components/HUD/DrumsScreen.tsx
+++ b/src/components/HUD/DrumsScreen.tsx
@@ -144,8 +144,17 @@ export const DrumsScreen: React.FC = () => {
                             return (
                                 <button
                                     key={i}
+                                    role="switch"
+                                    aria-checked={!!active}
+                                    aria-label={`Step ${i + 1}`}
                                     className={`step-button ${active ? 'active' : ''}`}
                                     onClick={() => store.toggleStep(selectedDrum as any, i)}
+                                    onKeyDown={(e) => {
+                                        if (e.key === 'Enter' || e.key === ' ') {
+                                            e.preventDefault()
+                                            store.toggleStep(selectedDrum as any, i)
+                                        }
+                                    }}
                                 />
                             )
                         })}