diff --git a/android/app/build.gradle b/android/app/build.gradle
index fed4ca45f..ccdb492b5 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,7 +152,7 @@ dependencies {
     implementation 'com.github.deckerst:Android-TiffBitmapFactory:876e53870a'
     // forked, built by JitPack, cf https://jitpack.io/p/deckerst/pixymeta-android
     implementation 'com.github.deckerst:pixymeta-android:706bd73d6e'
-    implementation 'com.github.bumptech.glide:glide:4.13.0'
+    implementation 'com.github.bumptech.glide:glide:4.13.1'
 
     kapt 'androidx.annotation:annotation:1.3.0'
     kapt 'com.github.bumptech.glide:compiler:4.13.0'
diff --git a/lib/widgets/common/action_mixins/entry_storage.dart b/lib/widgets/common/action_mixins/entry_storage.dart
index 4c458f894..d25e09f0c 100644
--- a/lib/widgets/common/action_mixins/entry_storage.dart
+++ b/lib/widgets/common/action_mixins/entry_storage.dart
@@ -50,12 +50,6 @@ mixin EntryStorageMixin on FeedbackMixin, PermissionAwareMixin, SizeAwareMixin {
       ))) return;
     }
 
-    final source = context.read<CollectionSource>();
-    if (source.initState != SourceInitializationState.full) {
-      // source may be uninitialized in viewer mode
-      await source.init();
-    }
-
     final entriesByDestination = <String, Set<AvesEntry>>{};
     switch (moveType) {
       case MoveType.copy:
@@ -116,6 +110,7 @@ mixin EntryStorageMixin on FeedbackMixin, PermissionAwareMixin, SizeAwareMixin {
       }
     }
 
+    final source = context.read<CollectionSource>();
     source.pauseMonitoring();
     final opId = mediaFileService.newOpId;
     await showOpReport<MoveOpEvent>(
diff --git a/lib/widgets/filter_grids/album_pick.dart b/lib/widgets/filter_grids/album_pick.dart
index 00c404f5c..0f33853fb 100644
--- a/lib/widgets/filter_grids/album_pick.dart
+++ b/lib/widgets/filter_grids/album_pick.dart
@@ -31,6 +31,10 @@ Future<String?> pickAlbum({
   required MoveType? moveType,
 }) async {
   final source = context.read<CollectionSource>();
+  if (source.initState != SourceInitializationState.full) {
+    // source may not be fully initialized in view mode
+    await source.init();
+  }
   final filter = await Navigator.push(
     context,
     MaterialPageRoute<AlbumFilter>(
diff --git a/lib/widgets/viewer/action/entry_action_delegate.dart b/lib/widgets/viewer/action/entry_action_delegate.dart
index ab151bec2..2ede09ed9 100644
--- a/lib/widgets/viewer/action/entry_action_delegate.dart
+++ b/lib/widgets/viewer/action/entry_action_delegate.dart
@@ -202,10 +202,6 @@ class EntryActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAwareMix
     );
     if (options == null) return;
 
-    final source = context.read<CollectionSource>();
-    if (source.initState != SourceInitializationState.full) {
-      await source.init();
-    }
     final destinationAlbum = await pickAlbum(context: context, moveType: MoveType.export);
     if (destinationAlbum == null) return;
     if (!await checkStoragePermissionForAlbums(context, {destinationAlbum})) return;
@@ -228,6 +224,7 @@ class EntryActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAwareMix
     }
 
     final selectionCount = selection.length;
+    final source = context.read<CollectionSource>();
     source.pauseMonitoring();
     await showOpReport<ExportOpEvent>(
       context: context,