diff --git a/editor/block-switcher/index.js b/editor/block-switcher/index.js
index 90723d1cdc1667..b23ed5acebc694 100644
--- a/editor/block-switcher/index.js
+++ b/editor/block-switcher/index.js
@@ -73,17 +73,26 @@ class BlockSwitcher extends wp.element.Component {
 					className="editor-block-switcher__toggle"
 					icon={ blockSettings.icon }
 					onClick={ this.toggleMenu }
+					aria-haspopup="true"
+					aria-expanded={ this.state.open }
+					label={ wp.i18n.__( 'Change block content type' ) }
 				>
 					<div className="editor-block-switcher__arrow" />
 				</IconButton>
 				{ this.state.open &&
-					<div className="editor-block-switcher__menu">
+					<div
+						className="editor-block-switcher__menu"
+						role="menu"
+						tabIndex="0"
+						aria-label={ wp.i18n.__( 'Content types' ) }
+					>
 						{ allowedBlocks.map( ( { slug, title, icon } ) => (
 							<IconButton
 								key={ slug }
 								onClick={ this.switchBlockType( slug ) }
 								className="editor-block-switcher__menu-item"
 								icon={ icon }
+								role="menuitem"
 							>
 								{ title }
 							</IconButton>
diff --git a/editor/block-switcher/style.scss b/editor/block-switcher/style.scss
index 2e97f123c8fd54..e33937c15f0182 100644
--- a/editor/block-switcher/style.scss
+++ b/editor/block-switcher/style.scss
@@ -56,6 +56,7 @@
 	cursor: pointer;
 
 	&:hover,
+	&:focus,
 	&:not(:disabled):hover {
 		color: $dark-gray-500;
 		border-color: $dark-gray-500;