diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index a60fab97a3d..3440071bf40 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -152,6 +152,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
             mForgotButton.setOnClickListener(v -> {
                 final Intent intent = new Intent();
                 intent.setClassName(SETTINGS_PACKAGE_NAME, ForgotPasswordActivity.class.getName());
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
                 getActivity().startActivity(intent);
                 getActivity().finish();