diff --git a/src/components/List/List.js b/src/components/List/List.js
index e9f393a..1649fc3 100644
--- a/src/components/List/List.js
+++ b/src/components/List/List.js
@@ -21,12 +21,13 @@ const StyledList = styled.ul`
   position: relative;
 
 `;
-
+// TODO keyboard controls
 const List = ({ inline, shadow, children, fullWidth, ...otherProps }) => (
   <StyledList
     inline={inline}
     shadow={shadow}
     fullWidth={fullWidth}
+    role='menu'
     {...otherProps}
   >
     {children}
diff --git a/src/components/ListItem/ListItem.js b/src/components/ListItem/ListItem.js
index dfb2b30..078d753 100644
--- a/src/components/ListItem/ListItem.js
+++ b/src/components/ListItem/ListItem.js
@@ -49,6 +49,8 @@ const ListItem = ({
     className={className}
     style={style}
     onClick={disabled ? undefined : onClick}
+    role='menuitem'
+    aria-disabled={disabled.toString()}
     {...otherProps}
   >
     {children}