diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py
index d384abdf..efe937cd 100644
--- a/atst/routes/requests/requests_form.py
+++ b/atst/routes/requests/requests_form.py
@@ -41,6 +41,7 @@ def requests_form_update(screen=1, request_id=None):
         current=screen,
         next_screen=screen + 1,
         request_id=request_id,
+        jedi_request=jedi_flow.request,
         can_submit=jedi_flow.can_submit,
     )
 
diff --git a/templates/requests/menu.html b/templates/requests/menu.html
index d62de246..40de55d3 100644
--- a/templates/requests/menu.html
+++ b/templates/requests/menu.html
@@ -1,7 +1,7 @@
 <div class="progress-menu progress-menu--four">
   <ul>
     {% for s in screens %}
-      {% if loop.index < current %}
+      {% if jedi_request and s.section in jedi_request.body %}
         {% set step_indicator = 'complete' %}
       {% elif loop.index == current %}
         {% set step_indicator = 'active' %}