diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt index 891262782..b510e4436 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationFragment.kt @@ -47,7 +47,12 @@ class CollectionCreationFragment : DialogFragment() { val sessionManager = requireComponents.core.sessionManager val publicSuffixList = requireComponents.publicSuffixList val tabs = sessionManager.getTabs(args.tabIds, publicSuffixList) - val selectedTabs = if (tabs.size == 1) setOf(tabs.first()) else emptySet() + val selectedTabs = if (args.selectedTabIds != null) { + sessionManager.getTabs(args.selectedTabIds, publicSuffixList).toSet() + } else { + if (tabs.size == 1) setOf(tabs.first()) else emptySet() + } + val tabCollections = requireComponents.core.tabCollectionStorage.cachedTabCollections val selectedTabCollection = args.selectedTabCollectionId .let { id -> tabCollections.firstOrNull { it.id == id } }