diff --git a/blocks.js b/blocks.js
index 5365021ed5e88..6e3e69df46b77 100644
--- a/blocks.js
+++ b/blocks.js
@@ -431,9 +431,11 @@ function attachControlActions() {
 		if ( getter ) {
 			node.addEventListener( 'click', function( event ) {
 				event.stopPropagation();
+				var previousOffset = selectedBlock.offsetTop;
 				swapNodes( selectedBlock, getter( selectedBlock ) );
 				attachBlockHandlers();
 				reselect();
+				window.scrollTo( window.scrollX, window.scrollY + selectedBlock.offsetTop - previousOffset );
 			}, false );
 		}
 	} );