diff --git a/plugins/woocommerce-admin/readme.txt b/plugins/woocommerce-admin/readme.txt
index 4232d39d034..9c5b95ebd6c 100644
--- a/plugins/woocommerce-admin/readme.txt
+++ b/plugins/woocommerce-admin/readme.txt
@@ -79,6 +79,7 @@ Release and roadmap notes are available on the [WooCommerce Developers Blog](htt
 
 == 2.2.0 3/26/2021 ==
 
+- Fix: Check if features are currently being enabled #6688
 - Add: Next new novel navigation nudge note #6610
 - Fix: Fix the activity panel toggle not closing on click #6679
 - Tweak: Add default value for contains op #6622
diff --git a/plugins/woocommerce-admin/src/Features/Features.php b/plugins/woocommerce-admin/src/Features/Features.php
index c77a60cd4ff..27f1c847f06 100644
--- a/plugins/woocommerce-admin/src/Features/Features.php
+++ b/plugins/woocommerce-admin/src/Features/Features.php
@@ -130,7 +130,14 @@ class Features {
 		$features = self::get_beta_feature_options();
 
 		if ( isset( $features[ $feature ] ) ) {
-			return 'yes' === get_option( $features[ $feature ], 'no' );
+			$feature_option = $features[ $feature ];
+			// Check if the feature is currently being enabled.
+			/* phpcs:disable WordPress.Security.NonceVerification */
+			if ( isset( $_POST[ $feature_option ] ) && '1' === $_POST[ $feature_option ] ) {
+				return true;
+			}
+
+			return 'yes' === get_option( $feature_option, 'no' );
 		}
 
 		return true;