diff --git a/packages/edit-site/src/components/actions/index.js b/packages/edit-site/src/components/actions/index.js
index dde55a83057ccb..7229c0a4011380 100644
--- a/packages/edit-site/src/components/actions/index.js
+++ b/packages/edit-site/src/components/actions/index.js
@@ -416,6 +416,9 @@ export const postRevisionsAction = {
 export const renamePostAction = {
 	id: 'rename-post',
 	label: __( 'Rename' ),
+	isEligible( post ) {
+		return post.status !== 'trash';
+	},
 	RenderModal: ( { items, closeModal } ) => {
 		const [ item ] = items;
 		const originalTitle = decodeEntities(
diff --git a/packages/edit-site/src/components/page-templates-template-parts/actions.js b/packages/edit-site/src/components/page-templates-template-parts/actions.js
index 0e9bbd3f1ab2dc..baea6d9c0f3def 100644
--- a/packages/edit-site/src/components/page-templates-template-parts/actions.js
+++ b/packages/edit-site/src/components/page-templates-template-parts/actions.js
@@ -248,16 +248,25 @@ export const renameTemplateAction = {
 				<VStack spacing="5">
 					<TextControl
 						__nextHasNoMarginBottom
+						__next40pxDefaultSize
 						label={ __( 'Name' ) }
 						value={ editedTitle }
 						onChange={ setEditedTitle }
 						required
 					/>
 					<HStack justify="right">
-						<Button variant="tertiary" onClick={ closeModal }>
+						<Button
+							variant="tertiary"
+							onClick={ closeModal }
+							__next40pxDefaultSize
+						>
 							{ __( 'Cancel' ) }
 						</Button>
-						<Button variant="primary" type="submit">
+						<Button
+							variant="primary"
+							type="submit"
+							__next40pxDefaultSize
+						>
 							{ __( 'Save' ) }
 						</Button>
 					</HStack>