diff --git a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
index 0c63506a..6e5c2afb 100644
--- a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
@@ -303,8 +303,9 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
 
     protected void startAccessibilitySettings() {
         try {
-            startFirstRunActivityForResult(new Intent(ACTION_ACCESSIBILITY_SETTINGS),
-                    ACCESSIBILITY_SETTINGS_ACTIVITY_REQUEST);
+            Intent intent = new Intent(ACTION_ACCESSIBILITY_SETTINGS);
+            intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
+            startFirstRunActivityForResult(intent, ACCESSIBILITY_SETTINGS_ACTIVITY_REQUEST);
             applyForwardTransition(TRANSITION_ID_DEFAULT);
         } catch (ActivityNotFoundException e) {
             Log.e(TAG, "Can't find the accessibility settings: " +