diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
index 1d63bc206b..4ca0ae5dba 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
@@ -86,12 +86,7 @@ class TabsTrayFragment : AppCompatDialogFragment() {
         val containerView = inflater.inflate(R.layout.fragment_tab_tray_dialog, container, false)
         inflater.inflate(R.layout.component_tabstray2, containerView as ViewGroup, true)
 
-        val initState =
-            if (requireArguments().getBoolean(EXTRA_MULTI_SELECT))
-                TabsTrayState(mode = TabsTrayState.Mode.Select(emptySet()))
-            else TabsTrayState()
-
-        tabsTrayStore = StoreProvider.get(this) { TabsTrayStore(initialState = initState) }
+        tabsTrayStore = StoreProvider.get(this) { TabsTrayStore() }
 
         fabView = LayoutInflater.from(containerView.context)
             .inflate(R.layout.component_tabstray_fab, containerView, true)
@@ -266,6 +261,10 @@ class TabsTrayFragment : AppCompatDialogFragment() {
             owner = this,
             view = view
         )
+
+        if (requireArguments().getBoolean(EXTRA_MULTI_SELECT)) {
+            tabsTrayStore.dispatch(TabsTrayAction.EnterSelectMode)
+        }
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {