diff --git a/components/toolbar/index.js b/components/toolbar/index.js
index deb539cc558496..e475ab8a3052a0 100644
--- a/components/toolbar/index.js
+++ b/components/toolbar/index.js
@@ -31,7 +31,6 @@ function Toolbar( { controls = [], children, className } ) {
 					<div
 						key={ [ setIndex, controlIndex ].join() }
 						className={ setIndex > 0 && controlIndex === 0 ? 'has-left-divider' : null }
-						tabIndex={ -1 }
 					>
 						<IconButton
 							icon={ control.icon }
diff --git a/editor/components/block-list/block.js b/editor/components/block-list/block.js
index 3dbf8e44d9860c..caf3f86d0c4a75 100644
--- a/editor/components/block-list/block.js
+++ b/editor/components/block-list/block.js
@@ -579,6 +579,7 @@ export class BlockListBlock extends Component {
 				data-type={ block.name }
 				onTouchStart={ this.onTouchStart }
 				onClick={ this.onClick }
+				tabIndex="0"
 				childHandledEvents={ [
 					'onKeyPress',
 					'onDragStart',
@@ -619,7 +620,6 @@ export class BlockListBlock extends Component {
 					onKeyDown={ this.onKeyDown }
 					onFocus={ this.onFocus }
 					className={ BlockListBlock.className }
-					tabIndex="0"
 					aria-label={ blockLabel }
 					data-block={ block.uid }
 				>