diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index 39bc183ee..e06f34a8e 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -620,10 +620,6 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 			return false;
 		}
 
-		if ( has_block( 'woocommerce-paypal-payments/paylater-messages' ) ) {
-			return true;
-		}
-
 		$location = $this->location();
 
 		$messaging_enabled_for_current_location = $this->settings_status->is_pay_later_messaging_enabled_for_location( $location );
@@ -638,6 +634,9 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 				return $messaging_enabled_for_current_location;
 			case 'block-editor':
 				return true;
+			case 'checkout-block':
+			case 'cart-block':
+				return has_block( 'woocommerce-paypal-payments/paylater-messages' ) || $this->is_block_editor();
 			default:
 				return false;
 		}
diff --git a/modules/ppcp-button/src/Helper/ContextTrait.php b/modules/ppcp-button/src/Helper/ContextTrait.php
index 3a33cbdbb..a9c81c08d 100644
--- a/modules/ppcp-button/src/Helper/ContextTrait.php
+++ b/modules/ppcp-button/src/Helper/ContextTrait.php
@@ -182,7 +182,7 @@ trait ContextTrait {
 	/**
 	 * Checks if it is the block editor page.
 	 */
-	private function is_block_editor(): bool {
+	protected function is_block_editor(): bool {
 		if ( ! function_exists( 'get_current_screen' ) ) {
 			return true;
 		}