diff --git a/app/templates/element/subnavigation.php b/app/templates/element/subnavigation.php
index a02cb6eea..6c8e6981c 100644
--- a/app/templates/element/subnavigation.php
+++ b/app/templates/element/subnavigation.php
@@ -57,13 +57,17 @@
     $navController = $tabsController;
   } elseif(!empty($vv_person_id)) {
     $curId = $vv_person_id;
-  } elseif($active == 'plugin' && !empty($vv_primary_link_obj) && !empty($vv_primary_link_model)) {
+  } elseif(
+    ($active == 'plugin' || (!empty($vv_primary_link) && $vv_primary_link == 'enrollment_flow_id'))  
+    && !empty($vv_primary_link_obj)
+    && !empty($vv_primary_link_model)
+  ) {
     $curId = $vv_primary_link_obj->id;
     $navController = $vv_primary_link_model;
   } elseif(!empty($vv_primary_link_id)) {
     $curId = $vv_primary_link_id;
-  } 
-  
+  }
+
   // For top-level nav while in edit pages.
   if ($name == 'person') {
     $linkFilter = ['person_id' => $curId];