diff --git a/client/app/components/ApplicationArea/ApplicationLayout/DesktopNavbar.jsx b/client/app/components/ApplicationArea/ApplicationLayout/DesktopNavbar.jsx
index ceb5f8dd5..f72251398 100644
--- a/client/app/components/ApplicationArea/ApplicationLayout/DesktopNavbar.jsx
+++ b/client/app/components/ApplicationArea/ApplicationLayout/DesktopNavbar.jsx
@@ -71,7 +71,7 @@ export default function DesktopNavbar() {
   const canCreateAlert = currentUser.hasPermission("list_alerts");
 
   return (
-    <nav className="desktop-navbar" role="navigation">
+    <nav className="desktop-navbar">
       <NavbarSection className="desktop-navbar-logo">
         <div role="menuitem">
           <Link href="./" tabIndex={0}>
@@ -82,24 +82,24 @@ export default function DesktopNavbar() {
 
       <NavbarSection>
         {currentUser.hasPermission("list_dashboards") && (
-          <Menu.Item key="dashboards" role="menuitem" className={activeState.dashboards ? "navbar-active-item" : null}>
-            <Link href="dashboards" tabIndex={0}>
+          <Menu.Item key="dashboards" className={activeState.dashboards ? "navbar-active-item" : null}>
+            <Link href="dashboards">
               <DesktopOutlinedIcon alt="Dashboard navigation button" />
               <span className="desktop-navbar-label">Dashboards</span>
             </Link>
           </Menu.Item>
         )}
         {currentUser.hasPermission("view_query") && (
-          <Menu.Item key="queries" role="menuitem" className={activeState.queries ? "navbar-active-item" : null}>
-            <Link href="queries" tabIndex={0}>
+          <Menu.Item key="queries" className={activeState.queries ? "navbar-active-item" : null}>
+            <Link href="queries">
               <CodeOutlinedIcon alt="Queries navigation button" />
               <span className="desktop-navbar-label">Queries</span>
             </Link>
           </Menu.Item>
         )}
         {currentUser.hasPermission("list_alerts") && (
-          <Menu.Item key="alerts" role="menuitem" className={activeState.alerts ? "navbar-active-item" : null}>
-            <Link href="alerts" tabIndex={0}>
+          <Menu.Item key="alerts" className={activeState.alerts ? "navbar-active-item" : null}>
+            <Link href="alerts">
               <AlertOutlinedIcon alt="Alerts navigation button" />
               <span className="desktop-navbar-label">Alerts</span>
             </Link>
@@ -113,7 +113,6 @@ export default function DesktopNavbar() {
             key="create"
             popupClassName="desktop-navbar-submenu"
             data-test="CreateButton"
-            role="menuitem"
             tabIndex={0}
             title={
               <React.Fragment>
@@ -122,14 +121,14 @@ export default function DesktopNavbar() {
               </React.Fragment>
             }>
             {canCreateQuery && (
-              <Menu.Item key="new-query" role="menuitem">
-                <Link href="queries/new" tabIndex={0} data-test="CreateQueryMenuItem">
+              <Menu.Item key="new-query">
+                <Link href="queries/new" data-test="CreateQueryMenuItem">
                   New Query
                 </Link>
               </Menu.Item>
             )}
             {canCreateDashboard && (
-              <Menu.Item key="new-dashboard" role="menuitem">
+              <Menu.Item key="new-dashboard">
                 <a
                   data-test="CreateDashboardMenuItem"
                   role="button"
@@ -140,8 +139,8 @@ export default function DesktopNavbar() {
               </Menu.Item>
             )}
             {canCreateAlert && (
-              <Menu.Item key="new-alert" role="menuitem">
-                <Link data-test="CreateAlertMenuItem" href="alerts/new" tabIndex={0}>
+              <Menu.Item key="new-alert">
+                <Link data-test="CreateAlertMenuItem" href="alerts/new">
                   New Alert
                 </Link>
               </Menu.Item>
@@ -151,15 +150,15 @@ export default function DesktopNavbar() {
       </NavbarSection>
 
       <NavbarSection>
-        <Menu.Item key="help" role="menuitem">
+        <Menu.Item key="help">
           <HelpTrigger showTooltip={false} type="HOME" tabIndex={0}>
             <QuestionCircleOutlinedIcon />
             <span className="desktop-navbar-label">Help</span>
           </HelpTrigger>
         </Menu.Item>
         {firstSettingsTab && (
-          <Menu.Item key="settings" role="menuitem" className={activeState.dataSources ? "navbar-active-item" : null}>
-            <Link href={firstSettingsTab.path} data-test="SettingsLink" tabIndex={0}>
+          <Menu.Item key="settings" className={activeState.dataSources ? "navbar-active-item" : null}>
+            <Link href={firstSettingsTab.path} data-test="SettingsLink">
               <SettingOutlinedIcon />
               <span className="desktop-navbar-label">Settings</span>
             </Link>
@@ -171,28 +170,23 @@ export default function DesktopNavbar() {
         <Menu.SubMenu
           key="profile"
           popupClassName="desktop-navbar-submenu"
-          role="menuitem"
           tabIndex={0}
           title={
             <span data-test="ProfileDropdown" className="desktop-navbar-profile-menu-title">
               <img className="profile__image_thumb" src={currentUser.profile_image_url} alt={currentUser.name} />
             </span>
           }>
-          <Menu.Item key="profile" role="menuitem">
-            <Link href="users/me" tabIndex={0}>
-              Profile
-            </Link>
+          <Menu.Item key="profile">
+            <Link href="users/me">Profile</Link>
           </Menu.Item>
           {currentUser.hasPermission("super_admin") && (
-            <Menu.Item key="status" role="menuitem">
-              <Link href="admin/status" tabIndex={0}>
-                System Status
-              </Link>
+            <Menu.Item key="status">
+              <Link href="admin/status">System Status</Link>
             </Menu.Item>
           )}
           <Menu.Divider />
-          <Menu.Item key="logout" role="menuitem">
-            <a data-test="LogOutButton" role="button" tabIndex={0} onClick={() => Auth.logout()}>
+          <Menu.Item key="logout">
+            <a data-test="LogOutButton" role="button" onClick={() => Auth.logout()}>
               Log out
             </a>
           </Menu.Item>
diff --git a/client/app/components/EditVisualizationButton/QueryControlDropdown.jsx b/client/app/components/EditVisualizationButton/QueryControlDropdown.jsx
index 563c08e74..12e28d477 100644
--- a/client/app/components/EditVisualizationButton/QueryControlDropdown.jsx
+++ b/client/app/components/EditVisualizationButton/QueryControlDropdown.jsx
@@ -41,7 +41,6 @@ export default function QueryControlDropdown(props) {
       <Menu.Item>
         <QueryResultsLink
           fileType="csv"
-          role="menuitem"
           tabIndex={0}
           disabled={props.queryExecuting || !props.queryResult.getData || !props.queryResult.getData()}
           query={props.query}
@@ -54,7 +53,6 @@ export default function QueryControlDropdown(props) {
       <Menu.Item>
         <QueryResultsLink
           fileType="tsv"
-          role="menuitem"
           tabIndex={0}
           disabled={props.queryExecuting || !props.queryResult.getData || !props.queryResult.getData()}
           query={props.query}
@@ -67,7 +65,6 @@ export default function QueryControlDropdown(props) {
       <Menu.Item>
         <QueryResultsLink
           fileType="xlsx"
-          role="menuitem"
           tabIndex={0}
           disabled={props.queryExecuting || !props.queryResult.getData || !props.queryResult.getData()}
           query={props.query}
diff --git a/client/app/components/TagsList.tsx b/client/app/components/TagsList.tsx
index 5efd3d704..d8bb49308 100644
--- a/client/app/components/TagsList.tsx
+++ b/client/app/components/TagsList.tsx
@@ -87,9 +87,9 @@ function TagsList({ tagsUrl, showUnselectAll = false, onUpdate }: TagsListProps)
       </div>
 
       <div className="tiled">
-        <Menu className="invert-stripe-position" mode="inline" selectedKeys={selectedTags} role="menu">
+        <Menu className="invert-stripe-position" mode="inline" selectedKeys={selectedTags}>
           {map(allTags, tag => (
-            <Menu.Item key={tag.name} className="m-0" role="menuitem">
+            <Menu.Item key={tag.name} className="m-0">
               <a
                 className="d-flex align-items-center justify-content-between"
                 role="menuitem"