diff --git a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart
index 11d32fe1..9d4fbff3 100644
--- a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart
+++ b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart
@@ -53,9 +53,12 @@ class TabSearch extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final selectedContainer = useState<ContainerData?>(
-      ref.read(selectedContainerDataProvider.select((value) => value.value)),
-    );
+    final selectedContainer = useState<ContainerData?>(null);
+    ref.listen(selectedContainerDataProvider, (previous, next) {
+      next.whenData((container) {
+        selectedContainer.value = container;
+      });
+    });
 
     final tabSearchResults = ref.watch(
       filteredTabPreviewsProvider(