diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
index 2a9171de3..c73694c99 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
@@ -44,8 +44,14 @@ object StorageUtils {
 
     const val TRASH_PATH_PLACEHOLDER = "#trash"
 
+    // whether the provided path is on one of this app specific directories:
+    // - /storage/{volume}/Android/data/{package_name}/files
+    // - /data/user/0/{package_name}/files
     private fun isAppFile(context: Context, path: String): Boolean {
-        val dirs = context.getExternalFilesDirs(null).filterNotNull()
+        val dirs = listOf(
+            *context.getExternalFilesDirs(null).filterNotNull().toTypedArray(),
+            context.filesDir,
+        )
         return dirs.any { path.startsWith(it.path) }
     }
 
diff --git a/lib/widgets/collection/collection_page.dart b/lib/widgets/collection/collection_page.dart
index 1b88caeba..0251638a3 100644
--- a/lib/widgets/collection/collection_page.dart
+++ b/lib/widgets/collection/collection_page.dart
@@ -222,6 +222,7 @@ class _CollectionPageState extends State<CollectionPage> {
     final delayDuration = context.read<DurationsData>().staggeredAnimationPageTarget;
     await Future.delayed(delayDuration + Durations.highlightScrollInitDelay);
 
+    if (!mounted) return;
     final animate = context.read<Settings>().accessibilityAnimations.animate;
     context.read<HighlightInfo>().trackItem(item, animate: animate, highlightItem: item);
   }