diff --git a/apps/weblibre/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart b/apps/weblibre/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart
index 78c89dd2..d0a5de58 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart
@@ -632,6 +632,7 @@ class QuickTabSwitcherView extends StatelessWidget {
             SelectableChips<QuickTabSwitcherItem, QuickTabSwitcherItem, String>(
               enableDelete: false,
               sortSelectedFirst: false,
+              maxCount: null,
               scrollController: scrollController,
               itemId: (item) => item.id,
               selectedItem: activeItem,
diff --git a/apps/weblibre/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart b/apps/weblibre/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart
index b644850d..03079460 100644
--- a/apps/weblibre/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart
+++ b/apps/weblibre/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart
@@ -247,6 +247,7 @@ class ContainerChips extends HookConsumerWidget {
                       String
                     >(
                       enableDelete: false,
+                      maxCount: null,
                       itemId: (container) => container.id,
                       itemBackgroundColor: (container) =>
                           ContainerColors.forChip(container.color),
diff --git a/apps/weblibre/lib/presentation/widgets/selectable_chips.dart b/apps/weblibre/lib/presentation/widgets/selectable_chips.dart
index 5afbf467..8900af68 100644
--- a/apps/weblibre/lib/presentation/widgets/selectable_chips.dart
+++ b/apps/weblibre/lib/presentation/widgets/selectable_chips.dart
@@ -58,7 +58,7 @@ class SelectableChips<T extends S, S, K> extends StatelessWidget {
   final Iterable<T> availableItems;
   final List<Widget> prefixListItems;
   final S? selectedItem;
-  final int maxCount;
+  final int? maxCount;
   final bool enableDelete;
   final bool sortSelectedFirst;
 
@@ -104,7 +104,10 @@ class SelectableChips<T extends S, S, K> extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    var items = availableItems.take(maxCount).toList();
+    var items = (maxCount != null)
+        ? availableItems.take(maxCount!).toList()
+        : availableItems.toList();
+
     if (sortSelectedFirst) {
       if (selectedItem case final T selectedItem) {
         final selectedIndex = items.indexWhere(