diff --git a/src/org/lineageos/setupwizard/LocationSettingsActivity.java b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
index 3a0bac34..e4ca1af0 100644
--- a/src/org/lineageos/setupwizard/LocationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
@@ -46,12 +46,6 @@ public class LocationSettingsActivity extends BaseSetupWizardActivity {
         View locationAccessView = findViewById(R.id.location);
         locationAccessView.setOnClickListener(v -> {
             mLocationAccess.setChecked(!mLocationAccess.isChecked());
-            mLocationManager.setLocationEnabledForUser(mLocationAccess.isChecked(),
-                    Process.myUserHandle());
-            if (mUserManager.isManagedProfile()) {
-                mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION,
-                        !mLocationAccess.isChecked());
-            }
         });
     }
 
@@ -65,6 +59,17 @@ public class LocationSettingsActivity extends BaseSetupWizardActivity {
         mLocationAccess.setChecked(checked);
     }
 
+    @Override
+    protected void onNextPressed() {
+        mLocationManager.setLocationEnabledForUser(mLocationAccess.isChecked(),
+                Process.myUserHandle());
+        if (mUserManager.isManagedProfile()) {
+            mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION,
+                    !mLocationAccess.isChecked());
+        }
+        super.onNextPressed();
+    }
+
     @Override
     protected int getLayoutResId() {
         return R.layout.location_settings;