diff --git a/settings/src/components/settings.js b/settings/src/components/settings.js
index 9d8f3ed5..55719647 100644
--- a/settings/src/components/settings.js
+++ b/settings/src/components/settings.js
@@ -48,6 +48,7 @@ export default function Settings() {
 			<WebAuthn
 				onKeyAdd={ () => {
 					if ( ! backupCodesEnabled ) {
+						setShouldAutoGenerateBackupCodes( true );
 						navigateToScreen( 'backup-codes' );
 					}
 				} }