1 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index 6d6138057cf..4f30b555ba0 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -87,12 +87,20 @@ module NavHelper
   end
 
   def show_super_sidebar?(user = current_user)
+    return false unless Feature.enabled?(:super_sidebar_nav, user)
+
     # The new sidebar is not enabled for anonymous use
     # Once we enable the new sidebar by default, this
     # should return true
     return false unless user
 
-    Feature.enabled?(:super_sidebar_nav, user) && user.use_new_navigation
+    # Users who got the special `super_sidebar_nav_enrolled` enabled,
+    # see the new nav as long as they don't explicitly opt-out via the toggle
+    if user.use_new_navigation.nil? && Feature.enabled?(:super_sidebar_nav_enrolled, user)
+      true
+    else
+      !!user.use_new_navigation
+    end
   end
 
   private