diff --git a/tests/e2e/specs/shopper/product-query/product-query-with-templates.test.ts b/tests/e2e/specs/shopper/product-query/product-query-with-templates.test.ts
index 294f3f7346a..d36e1509e6c 100644
--- a/tests/e2e/specs/shopper/product-query/product-query-with-templates.test.ts
+++ b/tests/e2e/specs/shopper/product-query/product-query-with-templates.test.ts
@@ -43,6 +43,7 @@ describe( `${ block.name } Block`, () => {
 			await configurateProductQueryBlock();
 			await page.waitForNetworkIdle();
 			await saveTemplate();
+			await page.waitForNetworkIdle();
 			await page.goto( BASE_URL + '/shop', {
 				waitUntil: 'networkidle0',
 			} );
@@ -70,6 +71,7 @@ describe( `${ block.name } Block`, () => {
 			await configurateProductQueryBlock();
 			await page.waitForNetworkIdle();
 			await saveTemplate();
+			await page.waitForNetworkIdle();
 			await page.goto( BASE_URL + '/product-category/uncategorized/', {
 				waitUntil: 'networkidle0',
 			} );
@@ -96,6 +98,7 @@ describe( `${ block.name } Block`, () => {
 			await configurateProductQueryBlock();
 			await page.waitForNetworkIdle();
 			await saveTemplate();
+			await page.waitForNetworkIdle();
 			await page.goto( BASE_URL + '/product-tag/newest/', {
 				waitUntil: 'networkidle0',
 			} );