diff --git a/templates/rider/popup.html.twig b/templates/rider/popup.html.twig
index 13b201d0..1a9f6e09 100644
--- a/templates/rider/popup.html.twig
+++ b/templates/rider/popup.html.twig
@@ -1,13 +1,13 @@
 <strong>{{ rider.getFullName }}</strong>
-{% set jo = rider.getActiveJobOrder %}
-{% if jo is not null %}
-{% set cust = jo.getCustomer %}
-{% set cv = jo.getCustomerVehicle %}
-<br>
-<a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
-{{ jo.getServiceTypeName }}<br>
-{{ jo.getStatusText }}<br><br>
-{{ cust.getNameDisplay }}<br>
-{{ cv.getPlateNumber }}
+{% set job_orders = rider.getOpenJobOrders %}
+{% if job_orders is not empty %}
+    {% for jo in job_orders %}
+        {% set cust = jo.getCustomer %}
+        {% set cv = jo.getCustomerVehicle %}
+        <br>
+        <a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
+        {{ cust.getNameDisplay }}<br>
+        {{ cv.getPlateNumber }}
+    {% endfor %}
 {% endif %}