diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 1b5f36a7b7..4308c55580 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 cd1b3087c0..75d88f423d 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,8 +7,9 @@
+ app:popUpToInclusive="true" />