diff --git a/packages/editor/src/components/rich-text/format-edit.js b/packages/editor/src/components/rich-text/format-edit.js
index 5bd2917e898644..6ab9569d8d0394 100644
--- a/packages/editor/src/components/rich-text/format-edit.js
+++ b/packages/editor/src/components/rich-text/format-edit.js
@@ -20,13 +20,18 @@ function isResult( { title, keywords = [] }, filterValue ) {
 
 function FillToolbarButton( { name, shortcutType, shortcutCharacter, ...props } ) {
 	let shortcut;
+	let fillName = 'RichText.ToolbarControls';
+
+	if ( name ) {
+		fillName += `.${ name }`;
+	}
 
 	if ( shortcutType && shortcutCharacter ) {
 		shortcut = displayShortcut[ shortcutType ]( shortcutCharacter );
 	}
 
 	return (
-		<Fill name={ `RichText.ToolbarControls.${ name }` }>
+		<Fill name={ fillName }>
 			<ToolbarButton
 				{ ...props }
 				shortcut={ shortcut }
diff --git a/packages/editor/src/components/rich-text/format-toolbar/index.js b/packages/editor/src/components/rich-text/format-toolbar/index.js
index 5eda88f589edf3..23ee381380f66f 100644
--- a/packages/editor/src/components/rich-text/format-toolbar/index.js
+++ b/packages/editor/src/components/rich-text/format-toolbar/index.js
@@ -11,6 +11,7 @@ const FormatToolbar = ( { controls } ) => {
 				{ controls.map( ( format ) =>
 					<Slot name={ `RichText.ToolbarControls.${ format }` } key={ format } />
 				) }
+				<Slot name="RichText.ToolbarControls" />
 			</Toolbar>
 		</div>
 	);