diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 212290d81a6..11c67a18ad3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2269,6 +2269,7 @@
                   android:configChanges="mnc|mcc|keyboard|keyboardHidden|uiMode"
                   android:windowSoftInputMode="adjustResize"
                   android:screenOrientation="nosensor"
+                  android:taskAffinity="com.android.settings.CryptKeeper"
                   android:process=":CryptKeeper">
             <intent-filter android:priority="10">
                 <action android:name="android.intent.action.MAIN" />