diff --git a/editor/components/writing-flow/index.js b/editor/components/writing-flow/index.js
index 78e33e7a0729f..57a8dc4bbf643 100644
--- a/editor/components/writing-flow/index.js
+++ b/editor/components/writing-flow/index.js
@@ -224,7 +224,10 @@ class WritingFlow extends Component {
 
 			if ( ( navigateDown && nextBlockUid ) || ( navigateUp && previousBlockUid ) ) {
 				event.preventDefault();
-				this.moveSelection( navigateUp );
+				const focusedBlockUid = navigateUp ? previousBlockUid : nextBlockUid;
+				if ( focusedBlockUid ) {
+					this.props.onSelectBlock( focusedBlockUid );
+				}
 			}
 
 			// Special case when reaching the end of the blocks (navigate to the next tabbable outside of the writing flow)