diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
index 110f1ff40..9d37e5569 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@@ -19,8 +19,6 @@ import kotlinx.android.synthetic.main.fragment_add_ons_management.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import mozilla.components.feature.addons.Addon
 import mozilla.components.feature.addons.AddonManagerException
@@ -28,8 +26,6 @@ import mozilla.components.feature.addons.ui.AddonsManagerAdapter
 import mozilla.components.feature.addons.ui.AddonsManagerAdapterDelegate
 import mozilla.components.feature.addons.ui.PermissionsDialogFragment
 import mozilla.components.feature.addons.ui.translatedName
-import mozilla.components.lib.state.ext.flowScoped
-import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getRootView
@@ -47,6 +43,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
      */
     private var isInstallationInProgress = false
     private var scope: CoroutineScope? = null
+    private var adapter: AddonsManagerAdapter? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -63,20 +60,6 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
         findPreviousDialogFragment()?.let { dialog ->
             dialog.onPositiveButtonClicked = onPositiveButtonClicked
         }
-
-        scope = requireContext().components.core.store.flowScoped { flow ->
-            flow.ifChanged { it.extensions }
-                .collect { _ ->
-                    view?.let {
-                        bindRecyclerView(it)
-                    }
-                }
-        }
-    }
-
-    override fun onStop() {
-        super.onStop()
-        scope?.cancel()
     }
 
     override fun onAddonItemClicked(addon: Addon) {
@@ -91,29 +74,35 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
         showPermissionDialog(addon)
     }
 
-    override fun onNotYetSupportedSectionClicked(unsupportedAddons: ArrayList<Addon>) {
-        showNotYetSupportedAddonFragment(unsupportedAddons)
+    override fun onNotYetSupportedSectionClicked(unsupportedAddons: List<Addon>) {
+        showNotYetSupportedAddonFragment(ArrayList(unsupportedAddons))
     }
 
     private fun bindRecyclerView(view: View) {
         val recyclerView = view.add_ons_list
         recyclerView.layoutManager = LinearLayoutManager(requireContext())
+        val shouldRefresh = adapter != null
         lifecycleScope.launch(IO) {
             try {
                 val addons = requireContext().components.addonManager.getAddons()
                 lifecycleScope.launch(Dispatchers.Main) {
                     runIfFragmentIsAttached {
-                        val adapter = AddonsManagerAdapter(
-                            requireContext().components.addonCollectionProvider,
-                            this@AddonsManagementFragment,
-                            addons,
-                            style = createAddonStyle(requireContext())
-                        )
+                        if (!shouldRefresh) {
+                            adapter = AddonsManagerAdapter(
+                                requireContext().components.addonCollectionProvider,
+                                this@AddonsManagementFragment,
+                                addons,
+                                style = createAddonStyle(requireContext())
+                            )
+                        }
                         isInstallationInProgress = false
                         view.add_ons_progress_bar.isVisible = false
                         view.add_ons_empty_message.isVisible = false
 
                         recyclerView.adapter = adapter
+                        if (shouldRefresh) {
+                            adapter?.updateAddons(addons)
+                        }
                     }
                 }
             } catch (e: AddonManagerException) {
@@ -213,7 +202,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
                             it.translatedName
                         )
                     )
-                    bindRecyclerView(view)
+                    adapter?.updateAddon(it)
                     addonProgressOverlay?.visibility = View.GONE
                     isInstallationInProgress = false
                 }