diff --git a/plugins/woocommerce-admin/tests/e2e/specs/activate-and-setup/complete-theme-selection-section.js b/plugins/woocommerce-admin/tests/e2e/specs/activate-and-setup/complete-theme-selection-section.js
index c7cb86fc229..ac25a5c996b 100644
--- a/plugins/woocommerce-admin/tests/e2e/specs/activate-and-setup/complete-theme-selection-section.js
+++ b/plugins/woocommerce-admin/tests/e2e/specs/activate-and-setup/complete-theme-selection-section.js
@@ -1,3 +1,4 @@
+import { waitForSelector } from '../../utils/lib';
 /**
  * @format
  */
@@ -8,5 +9,11 @@
 import { clickContinue } from './utils';
 
 export async function completeThemeSelectionSection() {
+	// Make sure we're on the theme selection page before clicking continue
+	await waitForSelector(
+		page,
+		'.woocommerce-profile-wizard__themes-tab-panel'
+	);
+
 	await clickContinue();
 }