diff --git a/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php b/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php
index 16a118fd14..b230e813ef 100644
--- a/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php
+++ b/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php
@@ -147,6 +147,8 @@ class CreateAndSendEmailUsingGutenbergCest {
 
   private function closeTemplateSelectionModal(\AcceptanceTester $i): void {
     $i->wantTo('Close template selector');
+    $i->waitForElementClickable('.email-editor-start_from_scratch_button');
+    $i->click('[aria-label="Basic"]');
     $i->waitForElementVisible('.block-editor-block-preview__container');
     $i->click('[aria-label="Close"]');
   }
diff --git a/packages/js/email-editor/src/components/template-select/select-modal.tsx b/packages/js/email-editor/src/components/template-select/select-modal.tsx
index 049f7c8dde..525e8e620d 100644
--- a/packages/js/email-editor/src/components/template-select/select-modal.tsx
+++ b/packages/js/email-editor/src/components/template-select/select-modal.tsx
@@ -38,11 +38,11 @@ function SelectTemplateBody( {
 }
 
 export function SelectTemplateModal( {
-                                       onSelectCallback,
-                                       closeCallback = null,
-                                       previewContent = '',
-                                     } ) {
-  const [ templates ] = usePreviewTemplates( previewContent );
+	onSelectCallback,
+	closeCallback = null,
+	previewContent = '',
+} ) {
+	const [ templates ] = usePreviewTemplates( previewContent );
 
 	const hasTemplates = templates?.length > 0;
 
@@ -85,9 +85,9 @@ export function SelectTemplateModal( {
 	return (
 		<Modal
 			title={ __( 'Select a template', 'mailpoet' ) }
-      onRequestClose={ () =>
-        closeCallback ? closeCallback() : handleCloseWithoutSelection()
-      }
+			onRequestClose={ () =>
+				closeCallback ? closeCallback() : handleCloseWithoutSelection()
+			}
 			isFullScreen
 		>
 			<SelectTemplateBody
@@ -97,17 +97,18 @@ export function SelectTemplateModal( {
 				handleTemplateSelection={ handleTemplateSelection }
 			/>
 
-      <Flex justify="flex-end">
-        <FlexItem>
-          <Button
-            variant="tertiary"
-            onClick={ () => handleCloseWithoutSelection() }
-            isBusy={ ! hasTemplates }
-          >
-            { __( 'Start from scratch', 'mailpoet' ) }
-          </Button>
-        </FlexItem>
-      </Flex>
+			<Flex justify="flex-end">
+				<FlexItem>
+					<Button
+						variant="tertiary"
+						className="email-editor-start_from_scratch_button"
+						onClick={ () => handleCloseWithoutSelection() }
+						isBusy={ ! hasTemplates }
+					>
+						{ __( 'Start from scratch', 'mailpoet' ) }
+					</Button>
+				</FlexItem>
+			</Flex>
 		</Modal>
 	);
 }