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} />
diff --git a/theme/melodyeditor.less b/theme/melodyeditor.less
index 240b568191b3..29ee5c97ce8e 100644
--- a/theme/melodyeditor.less
+++ b/theme/melodyeditor.less
@@ -182,6 +182,7 @@
     border-radius: 2px;
     border: none;
     padding-left: 5px;
+    background-color: @white;
     color: @black;
 }
 
@@ -300,4 +301,4 @@
 
 .playing {
     fill-opacity: 0.7;
-}
\ No newline at end of file
+}