diff --git a/blocks.js b/blocks.js
index b4cda4e2e7eb2..70d73730b7e9a 100644
--- a/blocks.js
+++ b/blocks.js
@@ -468,12 +468,9 @@ function attachTypeSwitcherActions() {
 	} );
 
 	Object.keys( typeToTag ).forEach( function( type ) {
-		var selector = '.switch-block__block .type-icon-' + type;
-		var button = queryFirst( selector );
-		var label = queryFirst( selector + ' + label' );
-
+		var iconSelector = '.switch-block__block .type-icon-' + type;
+		var button = queryFirst( iconSelector ).parentNode;
 		button.addEventListener( 'click', switchBlockType, false );
-		label.addEventListener( 'click', switchBlockType, false );
 
 		function switchBlockType( event ) {
 			if ( ! selectedBlock ) {