diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
index 9e9d16f13aa17..33bc79c0a4e8a 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
@@ -123,7 +123,8 @@ class CredentialManagerRepo(
       providerList as List<CreateCredentialProviderData>, context)
     var hasDefault = false
     var defaultProvider: ProviderInfo = providerList.first()
-    providerList.forEach{providerInfo ->
+    providerList.forEach{providerInfo -> providerInfo.createOptions =
+      providerInfo.createOptions.sortedWith(compareBy { it.lastUsedTimeMillis }).reversed()
       if (providerInfo.isDefault) {hasDefault = true; defaultProvider = providerInfo} }
     // TODO: covert from real requestInfo
     val requestDisplayInfo = RequestDisplayInfo(
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt
index d7e5ee8c721e8..70bb867a5de41 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt
@@ -22,7 +22,7 @@ data class ProviderInfo(
   val icon: Drawable,
   val name: String,
   val displayName: String,
-  val createOptions: List<CreateOptionInfo>,
+  var createOptions: List<CreateOptionInfo>,
   val isDefault: Boolean,
 )