diff --git a/app/src/main/java/com/example/onecamera/ui/gallery/GalleryViewModel.kt b/app/src/main/java/com/example/onecamera/ui/gallery/GalleryViewModel.kt
index f8c202d..031f15e 100644
--- a/app/src/main/java/com/example/onecamera/ui/gallery/GalleryViewModel.kt
+++ b/app/src/main/java/com/example/onecamera/ui/gallery/GalleryViewModel.kt
@@ -95,22 +95,20 @@ data class GalleryUiState(
     val error: String? = null,
 ) {
     val isSelectionMode: Boolean = selectedPhotoUris.isNotEmpty()
-    val selectedPhotos: List<Photo> = photos.filter { it.uri.toString() in selectedPhotoUris }
-    val sortedSubfolders: List<FolderNode> = if (sortAscending) {
-        subfolders.sortedBy { it.name.lowercase() }
-    } else {
-        subfolders.sortedByDescending { it.name.lowercase() }
+
+    val selectedPhotos: List<Photo> by lazy {
+        photos.filter { it.uri.toString() in selectedPhotoUris }
     }
-    val sortedPhotos: List<Photo> = if (sortAscending) {
-        photos.sortedBy { it.name.lowercase() }
-    } else {
-        photos.sortedByDescending { it.name.lowercase() }
+
+    val selectablePhotoUris: Set<String> by lazy {
+        photos.asSequence()
+            .filter { it.kind == GalleryFileKind.Photo }
+            .mapTo(HashSet()) { it.uri.toString() }
+    }
+
+    val allPhotosSelected: Boolean by lazy {
+        selectablePhotoUris.isNotEmpty() && selectedPhotoUris.containsAll(selectablePhotoUris)
     }
-    val selectablePhotoUris: Set<String> = photos
-        .filter { it.kind == GalleryFileKind.Photo }
-        .map { it.uri.toString() }
-        .toSet()
-    val allPhotosSelected: Boolean = selectablePhotoUris.isNotEmpty() && selectedPhotoUris.containsAll(selectablePhotoUris)
 }
 
 @HiltViewModel
@@ -342,18 +340,31 @@ class GalleryViewModel @Inject constructor(
 
     fun clearSelection() {
         dragSelectionBaseline = emptySet()
+        dragSelectableCache = null
         uiState.value = uiState.value.copy(selectedPhotoUris = emptySet())
     }
 
     private var dragSelectionBaseline: Set<String> = emptySet()
 
+    private var dragSelectableCache: Pair<List<Photo>, Set<String>>? = null
+
+    private fun currentSelectablePhotoUris(): Set<String> {
+        val photos = uiState.value.photos
+        dragSelectableCache?.let { (cachedPhotos, uris) ->
+            if (cachedPhotos === photos) return uris
+        }
+        val uris = uiState.value.selectablePhotoUris
+        dragSelectableCache = photos to uris
+        return uris
+    }
+
     fun beginDragSelection(anchorUri: String) {
         dragSelectionBaseline = uiState.value.selectedPhotoUris + anchorUri
         uiState.value = uiState.value.copy(selectedPhotoUris = dragSelectionBaseline)
     }
 
     fun updateDragSelection(rangeUris: Set<String>) {
-        val selectable = uiState.value.selectablePhotoUris
+        val selectable = currentSelectablePhotoUris()
         uiState.value = uiState.value.copy(
             selectedPhotoUris = dragSelectionBaseline + rangeUris.intersect(selectable),
         )
@@ -361,6 +372,7 @@ class GalleryViewModel @Inject constructor(
 
     fun endDragSelection() {
         dragSelectionBaseline = emptySet()
+        dragSelectableCache = null
     }
 
     fun zipSelectedPhotosAndShare() {