diff --git a/packages/app-mobile/components/screens/ConfigScreen.tsx b/packages/app-mobile/components/screens/ConfigScreen.tsx
index d05737c75c..87621ab5fd 100644
--- a/packages/app-mobile/components/screens/ConfigScreen.tsx
+++ b/packages/app-mobile/components/screens/ConfigScreen.tsx
@@ -98,6 +98,8 @@ class ConfigScreenComponent extends BaseScreenComponent {
 			}
 		};
 
+		this.saveButton_press = this.saveButton_press.bind(this);
+
 		this.syncStatusButtonPress_ = () => {
 			void NavService.go('Status');
 		};
@@ -199,6 +201,8 @@ class ConfigScreenComponent extends BaseScreenComponent {
 		this.logButtonPress_ = () => {
 			void NavService.go('Log');
 		};
+
+		this.handleSetting = this.handleSetting.bind(this);
 	}
 
 	public async checkFilesystemPermission() {
@@ -482,8 +486,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 		if (key === 'security.biometricsEnabled' && !!value) {
 			try {
 				await biometricAuthenticate();
-				shared.updateSettingValue(this, key, value);
-				await this.saveButton_press();
+				shared.updateSettingValue(this, key, value, async () => await this.saveButton_press());
 			} catch (error) {
 				shared.updateSettingValue(this, key, false);
 				Alert.alert(error.message);
@@ -492,8 +495,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
 		}
 
 		if (key === 'security.biometricsEnabled' && !value) {
-			shared.updateSettingValue(this, key, value);
-			await this.saveButton_press();
+			shared.updateSettingValue(this, key, value, async () => await this.saveButton_press());
 			return true;
 		}
 
diff --git a/packages/app-mobile/root.tsx b/packages/app-mobile/root.tsx
index 5f966c20b7..1ba25af1e0 100644
--- a/packages/app-mobile/root.tsx
+++ b/packages/app-mobile/root.tsx
@@ -866,7 +866,7 @@ class AppComponent extends React.Component {
 		}
 	}
 
-	public componentDidUpdate(prevProps: any) {
+	public async componentDidUpdate(prevProps: any) {
 		if (this.props.biometricsDone !== prevProps.biometricsDone && this.props.biometricsDone) {
 			logger.info('Sharing: componentDidUpdate: biometricsDone');
 			void this.handleShareData();
@@ -979,6 +979,7 @@ class AppComponent extends React.Component {
 		const biometricIsEnabled = !!this.state.sensorInfo && this.state.sensorInfo.enabled;
 		const shouldShowMainContent = !biometricIsEnabled || this.props.biometricsDone;
 
+		logger.info('root.biometrics: biometricsDone', this.props.biometricsDone);
 		logger.info('root.biometrics: biometricIsEnabled', biometricIsEnabled);
 		logger.info('root.biometrics: shouldShowMainContent', shouldShowMainContent);
 		logger.info('root.biometrics: this.state.sensorInfo', this.state.sensorInfo);
@@ -1008,7 +1009,7 @@ class AppComponent extends React.Component {
 								{ shouldShowMainContent && <AppNav screens={appNavInit} dispatch={this.props.dispatch} /> }
 							</View>
 							<DropdownAlert ref={(ref: any) => this.dropdownAlert_ = ref} tapToCloseEnabled={true} />
-							{ this.state.sensorInfo && <BiometricPopup
+							{ !shouldShowMainContent && <BiometricPopup
 								dispatch={this.props.dispatch}
 								themeId={this.props.themeId}
 								sensorInfo={this.state.sensorInfo}
@@ -1054,6 +1055,7 @@ const mapStateToProps = (state: any) => {
 		themeId: state.settings.theme,
 		noteSideMenuOptions: state.noteSideMenuOptions,
 		biometricsDone: state.biometricsDone,
+		biometricsEnabled: state.settings['security.biometricsEnabled'],
 	};
 };
 
diff --git a/packages/lib/components/shared/config-shared.js b/packages/lib/components/shared/config-shared.js
index 7fb453e430..ade2c8f83c 100644
--- a/packages/lib/components/shared/config-shared.js
+++ b/packages/lib/components/shared/config-shared.js
@@ -75,7 +75,9 @@ shared.checkSyncConfigMessages = function(comp) {
 	return output;
 };
 
-shared.updateSettingValue = function(comp, key, value) {
+shared.updateSettingValue = function(comp, key, value, callback = null) {
+	if (!callback) callback = () => {};
+
 	comp.setState(state => {
 		// @react-native-community/slider (4.4.0) will emit a valueChanged event
 		// when the component is mounted, even though the value hasn't changed.
@@ -99,7 +101,7 @@ shared.updateSettingValue = function(comp, key, value) {
 			settings: settings,
 			changedSettingKeys: changedSettingKeys,
 		};
-	});
+	}, callback);
 };
 
 shared.scheduleSaveSettings = function(comp) {