diff --git a/packages/block-library/src/query/edit/enhanced-pagination-modal.js b/packages/block-library/src/query/edit/enhanced-pagination-modal.js
index 42c66f5e94c904..04423116ac92e3 100644
--- a/packages/block-library/src/query/edit/enhanced-pagination-modal.js
+++ b/packages/block-library/src/query/edit/enhanced-pagination-modal.js
@@ -15,7 +15,7 @@ import { useState, useEffect } from '@wordpress/element';
 import { useContainsThirdPartyBlocks } from '../utils';
 
 const disableEnhancedPaginationDescription = __(
-	'Third-party blocks are not supported inside a Query Loop block with enhanced pagination enabled. To re-enable it, remove any third-party block and then update it in the Query Loop settings.'
+	'Plugin blocks are not supported yet. For the enhanced pagination to work, remove the plugin block, then re-enable "Enhanced pagination" in the Query Block settings.'
 );
 
 const modalDescriptionId =
@@ -38,7 +38,7 @@ export default function EnhancedPaginationModal( {
 		isOpen && (
 			<Modal
 				title={ __( 'Enhanced pagination will be disabled' ) }
-				className={ 'wp-block-query-enhanced-pagination-modal' }
+				className="wp-block-query__enhanced-pagination-modal"
 				aria={ {
 					describedby: modalDescriptionId,
 				} }
@@ -46,7 +46,7 @@ export default function EnhancedPaginationModal( {
 				shouldCloseOnEsc={ false }
 				shouldCloseOnClickOutside={ false }
 			>
-				<VStack alignment="right" spacing={ 8 }>
+				<VStack alignment="right" spacing={ 5 }>
 					<span id={ modalDescriptionId }>
 						{ disableEnhancedPaginationDescription }
 					</span>
@@ -56,7 +56,7 @@ export default function EnhancedPaginationModal( {
 							setAttributes( { enhancedPagination: false } );
 						} }
 					>
-						{ __( 'OK, understood' ) }
+						{ __( 'OK' ) }
 					</Button>
 				</VStack>
 			</Modal>
diff --git a/packages/block-library/src/query/edit/inspector-controls/enhanced-pagination-control.js b/packages/block-library/src/query/edit/inspector-controls/enhanced-pagination-control.js
index 4711a36f584101..042c9f1e75930c 100644
--- a/packages/block-library/src/query/edit/inspector-controls/enhanced-pagination-control.js
+++ b/packages/block-library/src/query/edit/inspector-controls/enhanced-pagination-control.js
@@ -15,7 +15,7 @@ export default function EnhancedPaginationControl( {
 	clientId,
 } ) {
 	const enhancedPaginationNotice = __(
-		'Enhanced pagination requires all descendants to be Core blocks. If you want to enable it, you have to remove all third-party blocks contained inside the Query Loop block.'
+		"Enhanced pagination doesn't support plugin blocks yet. If you want to enable it, you have to remove all plugin blocks from the Query Loop."
 	);
 
 	const containsThirdPartyBlocks = useContainsThirdPartyBlocks( clientId );
@@ -36,11 +36,13 @@ export default function EnhancedPaginationControl( {
 				} }
 			/>
 			{ containsThirdPartyBlocks && (
-				<div>
-					<Notice status="warning" isDismissible={ false }>
-						{ enhancedPaginationNotice }
-					</Notice>
-				</div>
+				<Notice
+					status="warning"
+					isDismissible={ false }
+					className="wp-block-query__enhanced-pagination-notice"
+				>
+					{ enhancedPaginationNotice }
+				</Notice>
 			) }
 		</>
 	);
diff --git a/packages/block-library/src/query/editor.scss b/packages/block-library/src/query/editor.scss
index d95cbecc7da220..61b553b6ed02e0 100644
--- a/packages/block-library/src/query/editor.scss
+++ b/packages/block-library/src/query/editor.scss
@@ -53,8 +53,12 @@
 	}
 }
 
-.wp-block-query-enhanced-pagination-modal {
+.wp-block-query__enhanced-pagination-modal {
 	@include break-small() {
 		max-width: $break-mobile;
 	}
 }
+
+.wp-block-query__enhanced-pagination-notice {
+	margin: 0;
+}
diff --git a/packages/block-library/src/query/style.scss b/packages/block-library/src/query/style.scss
index c560018056d7f0..25003dcca5431b 100644
--- a/packages/block-library/src/query/style.scss
+++ b/packages/block-library/src/query/style.scss
@@ -14,8 +14,8 @@
 		animation:
 			wp-block-query__enhanced-pagination-start-animation
 			30s
-			cubic-bezier(0, 1, 0, 1)
-			infinite;
+			cubic-bezier(0.03, 0.5, 0, 1)
+			forwards;
 	}
 
 	&.finish-animation {
diff --git a/packages/block-library/src/query/view.js b/packages/block-library/src/query/view.js
index 78cc423c80661a..2f334692e32910 100644
--- a/packages/block-library/src/query/view.js
+++ b/packages/block-library/src/query/view.js
@@ -44,7 +44,7 @@ store( {
 							context.core.query.message =
 								context.core.query.loadingText;
 							context.core.query.animation = 'start';
-						}, 300 );
+						}, 400 );
 
 						await navigate( ref.href );