diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlock.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlock.js
index 2c92942c7..e17a8ccd4 100644
--- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlock.js
+++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlock.js
@@ -32,7 +32,7 @@ const SettingsBlock = ( {
 	};
 
 	return (
-		<div className={ blockClassName }>
+		<div className={ blockClassName } id={ className }>
 			<BlockTitle
 				blockTitle={ title }
 				blockSuffix={ titleSuffix }
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Overview/Features.js b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Overview/Features.js
index 424709cdf..666e5b786 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Overview/Features.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Overview/Features.js
@@ -22,11 +22,9 @@ const Features = {
 						text: __( 'Configure', 'woocommerce-paypal-payments' ),
 						onClick: () => {
 							selectTab(
-								TAB_IDS.PAYMENT_METHODS,
-								'ppcp-paypal-checkout-card'
-							).then( () => {
-								setActiveModal( 'paypal' );
-							} );
+								TAB_IDS.SETTINGS,
+								'ppcp--save-payment-methods'
+							);
 						},
 						showWhen: 'enabled',
 						class: 'small-button',