diff --git a/react-common/components/theming/ThemeCard.tsx b/react-common/components/theming/ThemeCard.tsx
index 927fbb190d37..a57a00cdc70f 100644
--- a/react-common/components/theming/ThemeCard.tsx
+++ b/react-common/components/theming/ThemeCard.tsx
@@ -13,8 +13,10 @@ export const ThemeCard = (props: ThemeCardProps) => {
         <Card
             className="theme-card"
             role="listitem"
+            aria-label={theme.name}
             key={theme.id}
             onClick={() => onClick(theme)}
+            tabIndex={onClick && 0}
         >
             <div className="theme-info-box">
                 <ThemePreview theme={theme} />