diff --git a/packages/block-library/src/tab/index.php b/packages/block-library/src/tab/index.php
index ca5112449118cd..2b4e6574a6f615 100644
--- a/packages/block-library/src/tab/index.php
+++ b/packages/block-library/src/tab/index.php
@@ -49,7 +49,7 @@ function block_core_tab_render( array $attributes, string $content ): string {
 	$tag_processor->set_attribute( 'role', 'tabpanel' );
 	$tag_processor->set_attribute( 'aria-labelledby', 'tab__' . $tab_id );
 	$tag_processor->set_attribute( 'data-wp-bind--hidden', '!state.isActiveTab' );
-	$tag_processor->set_attribute( 'data-wp-bind--tabindex', 'state.tabIndexAttribute' );
+	$tag_processor->set_attribute( 'tabindex', 0 );
 
 	return (string) $tag_processor->get_updated_html();
 }
diff --git a/packages/block-library/src/tab/style.scss b/packages/block-library/src/tab/style.scss
index 6e57fc896fe837..699a2d89f08c5b 100644
--- a/packages/block-library/src/tab/style.scss
+++ b/packages/block-library/src/tab/style.scss
@@ -15,9 +15,6 @@
 	&:empty {
 		display: none !important;
 	}
-	&:not(.wp-block):focus {
-		outline: none;
-	}
 }
 
 .wp-block-tab.wp-block.has-background,
diff --git a/packages/block-library/src/tabs/view.js b/packages/block-library/src/tabs/view.js
index db077a4eb5d509..4aba2d0b7b36a8 100644
--- a/packages/block-library/src/tabs/view.js
+++ b/packages/block-library/src/tabs/view.js
@@ -86,7 +86,7 @@ const { actions: privateActions, state: privateState } = store(
 				return activeTabIndex === tabIndex;
 			},
 			/**
-			 * The value of the tabindex attribute.
+			 * The value of the tabindex attribute for tab buttons.
 			 * Only the active tab should be in the tab sequence.
 			 *
 			 * @type {number}