diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 1b5f36a7b..4308c5558 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -47,5 +47,5 @@ object FeatureFlags {
     /**
      * Enables new tab tray pref
      */
-    val tabTray = Config.channel.isDebug
+    val tabTray = Config.channel.isNightlyOrDebug
 }
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index cd1b3087c..75d88f423 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,8 +7,9 @@
 
     <action
         android:id="@+id/action_global_home"
+        app:destination="@+id/homeFragment"
         app:popUpTo="@id/homeFragment"
-        app:popUpToInclusive="false" />
+        app:popUpToInclusive="true" />
 
     <action
         android:id="@+id/action_global_browser"