diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
index 3f771740a5a8a..b10a533257417 100644
--- a/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
+++ b/superset-frontend/src/dashboard/components/FiltersBadge/index.tsx
@@ -73,6 +73,9 @@ const StyledFilterCount = styled.div`
     .incompatible-count {
       font-size: ${theme.typography.sizes.s}px;
     }
+    &:focus-visible {
+      outline: 2px solid ${theme.colors.primary.dark2};
+    }
   `}
 `;
 
@@ -160,7 +163,7 @@ export const FiltersBadge = ({ chartId }: FiltersBadgeProps) => {
   useEffect(() => {
     if (popoverVisible) {
       setTimeout(() => {
-        popoverContentRef?.current?.focus();
+        popoverContentRef?.current?.focus({ preventScroll: true });
       });
     }
   }, [popoverVisible]);