diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index 7c0769e36b5..cfd12f087c5 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -75,6 +75,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
     @Override
     protected void onCreate(Bundle savedInstance) {
         setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+        setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
         ThemeHelper.trySetDynamicColor(this);
         super.onCreate(savedInstance);
 
@@ -266,7 +267,6 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
             @Override
             public void onViewCreated(@NotNull View view, Bundle savedInstanceState) {
                 super.onViewCreated(view, savedInstanceState);
-
                 GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
                 int titleResource = R.string.lock_settings_picker_new_lock_title;