diff --git a/public/app/features/dimensions/editors/ResourceCards.tsx b/public/app/features/dimensions/editors/ResourceCards.tsx
index cd264712c7f..156153a2dfe 100644
--- a/public/app/features/dimensions/editors/ResourceCards.tsx
+++ b/public/app/features/dimensions/editors/ResourceCards.tsx
@@ -32,12 +32,17 @@ const MemoizedCell = memo(function Cell(props: CellProps) {
   return (
     <div style={style}>
       {card && (
-        // TODO: fix keyboard a11y
-        // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
         <div
           key={card.value}
           className={selected === card.value ? cx(styles.card, styles.selected) : styles.card}
           onClick={() => onChange(card.value)}
+          onKeyDown={(e: React.KeyboardEvent) => {
+            if (e.key === 'Enter') {
+              onChange(card.value);
+            }
+          }}
+          role="button"
+          tabIndex={0}
         >
           {card.imgUrl.endsWith('.svg') ? (
             <SanitizedSVG src={card.imgUrl} className={styles.img} />