diff --git a/src/AddSelect/List/List.js b/src/AddSelect/List/List.js
index dc65286..1ba665e 100644
--- a/src/AddSelect/List/List.js
+++ b/src/AddSelect/List/List.js
@@ -9,7 +9,11 @@ const List = ({
 }) => {
   const [focus, setFocus] = useFocus(entries.length);
   return (
-    <div className={`${prefix}__list`}>
+    <div
+      className={`${prefix}__list`}
+      role="treegrid"
+      aria-label="add select label"
+    >
       {entries.map((guid, index) => {
         const entry = data[guid];
         return (
@@ -18,6 +22,7 @@ const List = ({
             setFocus={setFocus}
             index={index}
             focus={focus === index}
+            setSize={entries.length}
             {...entry}
             {...rest}
           />
diff --git a/src/AddSelect/Row/Row.js b/src/AddSelect/Row/Row.js
index 1216602..1e5e54b 100644
--- a/src/AddSelect/Row/Row.js
+++ b/src/AddSelect/Row/Row.js
@@ -18,6 +18,8 @@ const Row = ({
   index,
   setFocus,
   parentId,
+  breadcrumbLevel,
+  setSize,
 }) => {
   const ref = useRef(null);
 
@@ -57,8 +59,16 @@ const Row = ({
       onKeyDown={onSelectKeyDown}
       tabIndex={focus ? 0 : -1}
       ref={ref}
+      role="row"
+      aria-level={breadcrumbLevel}
+      aria-setsize={setSize}
+      aria-posinset={index + 1}
+      aria-selected={isSelected}
     >
-      <div className={`${prefix}__input-group`}>
+      <div
+        className={`${prefix}__input-group`}
+        role="gridcell"
+      >
         {isSelected ? (
           <BiRadioCircleMarked size="2rem" onClick={onSelectHandler} />
         ) : (
@@ -71,6 +81,8 @@ const Row = ({
           <button
             onClick={onDrillDownHandler}
             className={`${prefix}__row-button`}
+            tabIndex={-1}
+            aria-hidden
           >
             <BiChevronRight size="2rem" />
           </button>
diff --git a/src/App.js b/src/App.js
index a89a050..a3077b9 100644
--- a/src/App.js
+++ b/src/App.js
@@ -67,6 +67,7 @@ const App = () => {
         selected={selected}
         setSelected={setSelected}
         parentHandler={parentHandler}
+        breadcrumbLevel={breadcrumbs.length}
       />
       <Footer
         selected={selected}