diff --git a/bin/plugin/commands/changelog.js b/bin/plugin/commands/changelog.js
index 2732602533ae4c..1691a4d4bc7b0f 100644
--- a/bin/plugin/commands/changelog.js
+++ b/bin/plugin/commands/changelog.js
@@ -108,6 +108,7 @@ const LABEL_FEATURE_MAPPING = {
 	'[Feature] UI Components': 'Components',
 	'[Feature] Component System': 'Components',
 	'[Feature] Template Editing Mode': 'Template Editor',
+	'[Feature] Writing Flow': 'Block Editor',
 	'[Feature] Blocks': 'Block Library',
 	'[Feature] Inserter': 'Block Editor',
 	'[Feature] Drag and Drop': 'Block Editor',
@@ -633,9 +634,6 @@ async function getChangelog( settings ) {
 		changelog += '### ' + group + '\n\n';
 
 		Object.keys( featureGroups )
-			.sort( ( a, b ) => {
-				return featureGroups[ b ].length - featureGroups[ a ].length;
-			} )
 			.sort( ( a, b ) => {
 				// sort "Unknown" to always be at the end
 				if ( a === 'Unknown' ) {
@@ -643,7 +641,7 @@ async function getChangelog( settings ) {
 				} else if ( b === 'Unknown' ) {
 					return -1;
 				}
-				return 0;
+				return featureGroups[ b ].length - featureGroups[ a ].length;
 			} )
 			.forEach( ( feature ) => {
 				const featureGroup = featureGroups[ feature ];