diff --git a/packages/js/email-editor/src/components/sidebar/email-type-info.tsx b/packages/js/email-editor/src/components/sidebar/email-type-info.tsx
index 1a5f7b6ff2..3b39884d56 100644
--- a/packages/js/email-editor/src/components/sidebar/email-type-info.tsx
+++ b/packages/js/email-editor/src/components/sidebar/email-type-info.tsx
@@ -69,54 +69,53 @@ export function EmailTypeInfo() {
 											'Template actions',
 											'mailpoet'
 										) }
+										onToggle={ ( isOpen ) =>
+											recordEvent(
+												'sidebar_template_actions_clicked',
+												{
+													currentTemplate:
+														template?.title,
+													isOpen,
+												}
+											)
+										}
 									>
-										{ ( { onClose, isOpen } ) => {
-											if ( isOpen ) {
-												recordEvent(
-													'sidebar_template_actions_clicked',
-													{
-														currentTemplate:
-															template?.title,
-													}
-												);
-											}
-											return (
-												<>
-													<MenuItem
-														onClick={ () => {
-															recordEvent(
-																'sidebar_template_actions_edit_template_clicked'
-															);
-															setEditTemplateModalOpen(
-																true
-															);
-															onClose();
-														} }
-													>
-														{ __(
-															'Edit template',
-															'mailpoet'
-														) }
-													</MenuItem>
-													<MenuItem
-														onClick={ () => {
-															recordEvent(
-																'sidebar_template_actions_swap_template_clicked'
-															);
-															setSelectTemplateModalOpen(
-																true
-															);
-															onClose();
-														} }
-													>
-														{ __(
-															'Swap template',
-															'mailpoet'
-														) }
-													</MenuItem>
-												</>
-											);
-										} }
+										{ ( { onClose } ) => (
+											<>
+												<MenuItem
+													onClick={ () => {
+														recordEvent(
+															'sidebar_template_actions_edit_template_clicked'
+														);
+														setEditTemplateModalOpen(
+															true
+														);
+														onClose();
+													} }
+												>
+													{ __(
+														'Edit template',
+														'mailpoet'
+													) }
+												</MenuItem>
+												<MenuItem
+													onClick={ () => {
+														recordEvent(
+															'sidebar_template_actions_swap_template_clicked'
+														);
+														setSelectTemplateModalOpen(
+															true
+														);
+														onClose();
+													} }
+												>
+													{ __(
+														'Swap template',
+														'mailpoet'
+													) }
+												</MenuItem>
+											</>
+										) }
 									</DropdownMenu>
 								</FlexItem>
 							</Flex>