Merge a5c9548b4d into aab5d4411b

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -302,9 +302,16 @@ class PatchesSelectorViewModel extends BaseViewModel {
 
   Future<void> loadSelectedPatches(BuildContext context) async {
     if (_managerAPI.isPatchesChangeEnabled()) {
-      final List<String> selectedPatches = await _managerAPI.getSelectedPatches(
-        locator<PatcherViewModel>().selectedApp!.packageName,
-      );
+      final List<String>? appliedPatches = _managerAPI
+          .getPatchedApps()
+          .firstWhereOrNull(
+            (app) => app.packageName == selectedApp!.packageName,
+          )
+          ?.appliedPatches;
+      final List<String> selectedPatches = appliedPatches ??
+          await _managerAPI.getSelectedPatches(
+            selectedApp!.packageName,
+          );
       if (selectedPatches.isNotEmpty) {
         this.selectedPatches.clear();
         this.selectedPatches.addAll(