diff --git a/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php b/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php
index 7a13ca257e..1226903f1d 100644
--- a/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php
+++ b/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php
@@ -115,11 +115,11 @@ class CreateAndSendEmailUsingGutenbergCest {
     // this issue is not confirmed to be real issue but only on the acceptance test site
     $i->click('div.interface-pinned-items > button'); // close sidebar
     $i->click('.mailpoet-preview-dropdown button[aria-label="Preview"]');
-    $i->waitForElementVisible('//button[text()="Preview in new tab"]');
-    $i->waitForElementClickable('//button[text()="Preview in new tab"]');
-    $i->click('//button[text()="Preview in new tab"]');
+    $i->waitForElementVisible('//a[text()="Preview in new tab"]');
+    $i->waitForElementClickable('//a[text()="Preview in new tab"]');
+    $i->click('//a[text()="Preview in new tab"]');
     $i->switchToNextTab();
-    $i->canSeeInCurrentUrl('endpoint=view_in_browser');
+    $i->canSeeInCurrentUrl('post_type=mailpoet_email');
     $i->canSee('Sample text');
     $i->closeTab();
 
diff --git a/packages/js/email-editor/src/types/wordpress-modules.ts b/packages/js/email-editor/src/types/wordpress-modules.ts
index 7394706844..972d0fa78f 100644
--- a/packages/js/email-editor/src/types/wordpress-modules.ts
+++ b/packages/js/email-editor/src/types/wordpress-modules.ts
@@ -37,7 +37,7 @@ declare module '@wordpress/editor' {
 	export const PostPreviewButton: ComponentType<
 		WPPostPreviewButton.Props & {
 			className?: string;
-			role: string;
+			role?: string;
 			textContent: JSX.Element;
 			onPreview: () => void;
 		}
diff --git a/packages/php/email-editor/src/Engine/class-email-editor.php b/packages/php/email-editor/src/Engine/class-email-editor.php
index f5f60be820..e7e00f54ba 100644
--- a/packages/php/email-editor/src/Engine/class-email-editor.php
+++ b/packages/php/email-editor/src/Engine/class-email-editor.php
@@ -288,7 +288,7 @@ class Email_Editor {
 
 		add_filter(
 			'mailpoet_email_editor_preview_post_template_html',
-			function ( $post ) {
+			function () use ( $post ) {
 				// Generate HTML content for email editor post.
 				return $this->send_preview_email->render_html( $post );
 			}