diff --git a/superset-frontend/src/components/DropdownSelectableIcon/index.tsx b/superset-frontend/src/components/DropdownSelectableIcon/index.tsx
index a1b755dcf..12d23dc24 100644
--- a/superset-frontend/src/components/DropdownSelectableIcon/index.tsx
+++ b/superset-frontend/src/components/DropdownSelectableIcon/index.tsx
@@ -90,8 +90,9 @@ const StyleMenuItem = styled(Menu.Item)<{ divider?: boolean }>`
 const StyleSubmenuItem = styled.div`
   display: flex;
   justify-content: space-between;
-  > span {
-    width: 100%;
+  width: 100%;
+  > div {
+    flex-grow: 1;
   }
 `;
 
@@ -102,7 +103,7 @@ export default (props: DropDownSelectableProps) => {
     () => (label: string | ReactNode, key: string, divider?: boolean) => (
       <StyleMenuItem key={key} divider={divider}>
         <StyleSubmenuItem>
-          <span>{label}</span>
+          {label}
           {selectedKeys?.includes(key) && (
             <Icons.Check
               iconColor={theme.colors.primary.base}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterConfigurationLink/index.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterConfigurationLink/index.tsx
index f8164d241..6b4fea62a 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterConfigurationLink/index.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterConfigurationLink/index.tsx
@@ -62,10 +62,14 @@ export const FilterConfigurationLink: FC<FCBProps> = ({
 
   return (
     <>
-      {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
-      <span {...getFilterBarTestId('create-filter')} onClick={handleClick}>
+      <div
+        {...getFilterBarTestId('create-filter')}
+        onClick={handleClick}
+        role="button"
+        tabIndex={0}
+      >
         {children}
-      </span>
+      </div>
       <FiltersConfigModal
         isOpen={isOpen}
         onSave={submit}