diff --git a/packages/edit-site/src/hooks/template-part-edit.js b/packages/edit-site/src/hooks/template-part-edit.js
index 234a2ba356ee1b..1c5c47a68fbfb7 100644
--- a/packages/edit-site/src/hooks/template-part-edit.js
+++ b/packages/edit-site/src/hooks/template-part-edit.js
@@ -68,16 +68,14 @@ export const withEditBlockControls = createHigherOrderComponent(
 		const { attributes, name } = props;
 		const isDisplayed = name === 'core/template-part' && attributes.slug;
 
-		if ( ! isDisplayed ) {
-			return <BlockEdit { ...props } />;
-		}
-
 		return (
 			<>
-				<BlockEdit { ...props } />
-				<BlockControls group="other">
-					<EditTemplatePartMenuItem attributes={ attributes } />
-				</BlockControls>
+				<BlockEdit key="edit" { ...props } />
+				{ isDisplayed && (
+					<BlockControls group="other">
+						<EditTemplatePartMenuItem attributes={ attributes } />
+					</BlockControls>
+				) }
 			</>
 		);
 	},