diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt
index b8eded202..6c04d7f98 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt
@@ -122,6 +122,7 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), TabTrayInteractor {
 
     override fun onDestroyView() {
         _tabTrayView = null
+        tabsFeature = null
         super.onDestroyView()
     }
 
@@ -134,7 +135,6 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), TabTrayInteractor {
     override fun onStop() {
         tabsFeature?.stop()
         tabTrayView.tabsTray.unregister(tabTrayView)
-        tabsFeature = null
         super.onStop()
     }