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 e37e5259..f44bc2a5 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
@@ -39,9 +39,8 @@ class TabSearch extends HookConsumerWidget {
         .watch(
           seamlessFilteredTabPreviewsProvider(
             TabSearchPartition.search,
-            (selectedContainer.value != null)
-                ? ContainerFilterById(containerId: selectedContainer.value!.id)
-                : ContainerFilterDisabled(),
+            // ignore: provider_parameters
+            ContainerFilter.from(selectedContainer.value?.id),
           ),
         )
         .value;
diff --git a/app/lib/features/geckoview/features/tabs/data/entities/container_filter.dart b/app/lib/features/geckoview/features/tabs/data/entities/container_filter.dart
index 509a4a9c..d3cff8d9 100644
--- a/app/lib/features/geckoview/features/tabs/data/entities/container_filter.dart
+++ b/app/lib/features/geckoview/features/tabs/data/entities/container_filter.dart
@@ -1,6 +1,14 @@
 import 'package:fast_equatable/fast_equatable.dart';
 
-sealed class ContainerFilter with FastEquatable {}
+sealed class ContainerFilter with FastEquatable {
+  ContainerFilter();
+
+  factory ContainerFilter.from(String? containerId) {
+    return (containerId != null)
+        ? ContainerFilterById(containerId: containerId)
+        : ContainerFilterDisabled();
+  }
+}
 
 class ContainerFilterById extends ContainerFilter {
   final String? containerId;