diff --git a/blocks/library/gallery/index.js b/blocks/library/gallery/index.js
index 5fd47882b035a8..0352d6df16008b 100644
--- a/blocks/library/gallery/index.js
+++ b/blocks/library/gallery/index.js
@@ -4,8 +4,13 @@
 import { __ } from 'i18n';
 import './style.scss';
 import { registerBlockType, query as hpq } from '../../api';
+import { Fill } from 'react-slot-fill';
+
+/**
+ * WordPress dependencies
+ */
+import { Toolbar, Placeholder } from 'components';
 
-import Placeholder from 'components/placeholder';
 import MediaUploadButton from '../../media-upload-button';
 import InspectorControls from '../../inspector-controls';
 
@@ -104,11 +109,6 @@ registerBlockType( 'core/gallery', {
 			isActive: ( { align } ) => 'full' === align,
 			onClick: toggleAlignment( 'full' ),
 		},
-		{
-			icon: 'format-image',
-			title: wp.i18n.__( 'Edit Gallery' ),
-			onClick: editMediaLibrary,
-		},
 	],
 
 	getEditWrapperProps( attributes ) {
@@ -144,6 +144,13 @@ registerBlockType( 'core/gallery', {
 
 		return (
 			<div className={ `blocks-gallery align${ align } columns-${ columns }` }>
+				<Fill name="Formatting.Toolbar">
+					<Toolbar controls={ [ {
+						icon: 'format-image',
+						title: __( 'Edit Gallery' ),
+						onClick: () => editMediaLibrary( attributes, setAttributes ),
+					} ] } />
+				</Fill>
 				{ images.map( ( img ) => (
 					<GalleryImage key={ img.url } img={ img } />
 				) ) }