diff --git a/lib/widgets/library_search_results.dart b/lib/widgets/library_search_results.dart
index 7aa82081..be8d68de 100644
--- a/lib/widgets/library_search_results.dart
+++ b/lib/widgets/library_search_results.dart
@@ -61,10 +61,9 @@ class _LibrarySearchResultsState extends ConsumerState<LibrarySearchResults> {
     if (oldWidget.query != widget.query) {
       _pages = 1;
       // A selection belongs to the results it was made in.
-      if (_selecting) {
-        _selected.clear();
-        _selectionOverlay.hide();
-      }
+      _selected.clear();
+      _suppressSelectionBar = false;
+      _selectionOverlay.hide();
     }
   }
 
@@ -112,7 +111,10 @@ class _LibrarySearchResultsState extends ConsumerState<LibrarySearchResults> {
 
   void _exitSelection() {
     if (!mounted) return;
-    setState(_selected.clear);
+    setState(() {
+      _selected.clear();
+      _suppressSelectionBar = false;
+    });
     _selectionOverlay.hide();
   }
 
diff --git a/test/library_search_reenrich_test.dart b/test/library_search_reenrich_test.dart
new file mode 100644
index 00000000..ca186353
--- /dev/null
+++ b/test/library_search_reenrich_test.dart
@@ -0,0 +1,154 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:spotiflac_android/l10n/l10n.dart';
+import 'package:spotiflac_android/models/settings.dart';
+import 'package:spotiflac_android/models/unified_library_item.dart';
+import 'package:spotiflac_android/providers/library_search_provider.dart';
+import 'package:spotiflac_android/providers/local_library_provider.dart';
+import 'package:spotiflac_android/providers/settings_provider.dart';
+import 'package:spotiflac_android/services/library_database.dart';
+import 'package:spotiflac_android/services/library_search.dart';
+import 'package:spotiflac_android/theme/app_theme.dart';
+import 'package:spotiflac_android/theme/mornye_theme.dart';
+import 'package:spotiflac_android/widgets/library_search_results.dart';
+import 'package:spotiflac_android/widgets/selection_bottom_bar.dart';
+
+class _Settings extends SettingsNotifier {
+  @override
+  AppSettings build() => const AppSettings();
+
+  @override
+  Future<void> syncLyricsSettingsToBackend({AppSettings? settings}) async {}
+}
+
+class _Library extends LocalLibraryNotifier {
+  @override
+  LocalLibraryState build() => LocalLibraryState();
+
+  @override
+  Future<void> scanAllSources({bool forceFullScan = false}) async {}
+}
+
+void main() {
+  for (final mornye in [false, true]) {
+    for (final hosted in [false, true]) {
+      testWidgets(
+        'search can re-enrich another song without leaving search ($mornye/$hosted)',
+        (tester) async {
+          SharedPreferences.setMockInitialValues({});
+          tester.view.physicalSize = const Size(800, 1600);
+          tester.view.devicePixelRatio = 1;
+          addTearDown(tester.view.reset);
+          const channel = MethodChannel('com.zarz.spotiflac/backend');
+          final messenger = tester.binding.defaultBinaryMessenger;
+          final requests = <Map<String, dynamic>>[];
+          messenger.setMockMethodCallHandler(channel, (call) async {
+            if (call.method != 'reEnrichFile') return null;
+            final request = Map<String, dynamic>.from(
+              jsonDecode((call.arguments as Map)['request_json'] as String)
+                  as Map,
+            );
+            requests.add(request);
+            return request['preview_only'] == true
+                ? {
+                    'method': 'preview',
+                    'enriched_metadata': {'isrc': 'USABC2600001'},
+                  }
+                : {'method': 'native'};
+          });
+          addTearDown(() => messenger.setMockMethodCallHandler(channel, null));
+          const search = Scaffold(
+            body: CustomScrollView(
+              slivers: [
+                LibrarySearchResults(query: 'Song', onOpenArtist: _openArtist),
+              ],
+            ),
+          );
+          await tester.pumpWidget(
+            ProviderScope(
+              overrides: [
+                settingsProvider.overrideWith(_Settings.new),
+                localLibraryProvider.overrideWith(_Library.new),
+                librarySearchProvider.overrideWith(
+                  (ref, request) async =>
+                      request.kind == LibrarySearchKind.songs
+                      ? [
+                          for (final id in ['a', 'b'])
+                            LibrarySearchHit(
+                              kind: LibrarySearchKind.songs,
+                              id: id,
+                              title: 'Song $id',
+                              source: 'local',
+                            ),
+                        ]
+                      : [],
+                ),
+                librarySearchTrackProvider.overrideWith(
+                  (ref, key) async => UnifiedLibraryItem.fromLocalLibrary(
+                    LocalLibraryItem(
+                      id: key.id,
+                      trackName: 'Song ${key.id}',
+                      artistName: 'Artist',
+                      albumName: 'Album',
+                      filePath: '/music/${key.id}.flac',
+                      scannedAt: DateTime(2026),
+                    ),
+                  ),
+                ),
+              ],
+              child: MaterialApp(
+                theme: mornye
+                    ? MornyeTheme.build(Brightness.dark)
+                    : AppTheme.light(),
+                localizationsDelegates: AppLocalizations.localizationsDelegates,
+                supportedLocales: AppLocalizations.supportedLocales,
+                home: hosted
+                    ? const SelectionOverlayHost(child: search)
+                    : search,
+              ),
+            ),
+          );
+          await tester.pumpAndSettle();
+
+          for (final id in ['a', 'b']) {
+            await tester.longPress(find.text('Song $id'));
+            await tester.pumpAndSettle();
+            expect(find.text('Re-enrich (1)'), findsOneWidget);
+            await tester.tap(find.text('Re-enrich (1)'));
+            await tester.pumpAndSettle();
+            expect(find.byType(SelectionBottomBar), findsNothing);
+            await tester.tap(find.text('Fill missing tags'));
+            await tester.ensureVisible(find.text('Review changes'));
+            await tester.pumpAndSettle();
+            await tester.tap(find.text('Review changes'));
+            await tester.pumpAndSettle();
+            await tester.ensureVisible(find.text('Apply changes'));
+            await tester.pumpAndSettle();
+            await tester.tap(find.text('Apply changes'));
+            await tester.pumpAndSettle();
+            await tester.tap(find.text('OK'));
+            await tester.pumpAndSettle();
+            expect(find.byType(SelectionBottomBar), findsNothing);
+            expect(find.byType(LibrarySearchResults), findsOneWidget);
+            expect(find.text('Song a'), findsOneWidget);
+            expect(find.text('Song b'), findsOneWidget);
+          }
+          expect(requests.map((request) => request['file_path']), [
+            '/music/a.flac',
+            '/music/a.flac',
+            '/music/b.flac',
+            '/music/b.flac',
+          ]);
+          expect(tester.takeException(), isNull);
+        },
+      );
+    }
+  }
+}
+
+void _openArtist(String _) {}