diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eb3be0e37d1..79821d0d750 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1598,6 +1598,11 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".password.SetupChooseLockGeneric$InternalActivity"
+            android:theme="@style/GlifTheme.Light"
+            android:exported="false"
+            android:excludeFromRecents="true" />
+
         <activity android:name=".password.ChooseLockGeneric"
             android:label="@string/lockpassword_choose_lock_generic_header"
             android:excludeFromRecents="true"