diff --git a/packages/edit-site/src/components/dataviews/add-filter.js b/packages/edit-site/src/components/dataviews/add-filter.js
index e8ff32784f9d54..66b4bcc2edb01d 100644
--- a/packages/edit-site/src/components/dataviews/add-filter.js
+++ b/packages/edit-site/src/components/dataviews/add-filter.js
@@ -61,7 +61,8 @@ export default function AddFilter( { fields, view, onChangeView } ) {
 			label={ __( 'Add filter' ) }
 			trigger={
 				<Button
-					aria-disabled={ filters.length === view.filters?.length }
+					disabled={ filters.length === view.filters?.length }
+					__experimentalIsFocusable={ true }
 					__next40pxDefaultSize={ true }
 					icon={ plus }
 					variant="tertiary"
diff --git a/packages/edit-site/src/components/dataviews/reset-filters.js b/packages/edit-site/src/components/dataviews/reset-filters.js
index f9758a9f3ecf4f..b44bb2829f8f42 100644
--- a/packages/edit-site/src/components/dataviews/reset-filters.js
+++ b/packages/edit-site/src/components/dataviews/reset-filters.js
@@ -7,7 +7,8 @@ import { __ } from '@wordpress/i18n';
 export default ( { view, onChangeView } ) => {
 	return (
 		<Button
-			aria-disabled={ view.search === '' && view.filters?.length === 0 }
+			disabled={ view.search === '' && view.filters?.length === 0 }
+			__experimentalIsFocusable={ true }
 			__next40pxDefaultSize={ true }
 			variant="tertiary"
 			onClick={ () => {