diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index 3f9fc632..b46f719b 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -939,12 +939,18 @@ class JobOrderController extends Controller
     /**
      * @ParamConverter("jo", class="App\Entity\JobOrder")
      */
-    public function popupInfo(JobOrder $jo)
+    public function popupInfo(JobOrder $jo, JobOrderHandlerInterface $jo_handler)
     {
         if ($jo == null)
             return new Response('No job order data');
 
-        return $this->render('job-order/popup.html.twig', [ 'jo' => $jo ]);
+        // get the right template
+        $template = $jo_handler->getTwigTemplate('jo_popup');
+
+        $params['jo'] = $jo;
+
+        // response
+        return $this->render($template, $params);
     }
 
     /**
diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index d490ce56..862d431b 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -2842,6 +2842,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         $this->template_hash['jo_onestep_edit_form'] = 'job-order/cmb.form.onestep.html.twig';
         $this->template_hash['jo_walkin_form'] = 'job-order/cmb.form.walkin.html.twig';
         $this->template_hash['jo_walkin_edit_form'] = 'job-order/cmb.form.walkin.html.twig';
+        $this->template_hash['jo_popup'] = 'job-order/cmb.popup.html.twig';
     }
 
     protected function checkTier($tier)
diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index f3a4d96f..dc154b12 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -2503,8 +2503,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         $this->template_hash['jo_list_fulfillment'] = 'job-order/list.fulfillment.html.twig';
         $this->template_hash['jo_list_open'] = 'job-order/list.open.html.twig';
         $this->template_hash['jo_list_all'] = 'job-order/list.all.html.twig';
-        $this->template_hash['jo_onestep'] = 'job-order/form.onestep.html.twig';
-        $this->template_hash['jo_onestep_edit_form'] = 'job-order/form.onestep.html.twig'; 
+        $this->template_hash['jo_popup'] = 'job-order/popup.html.twig';
     }
 
     protected function checkTier($tier)
diff --git a/templates/job-order/cmb.popup.html.twig b/templates/job-order/cmb.popup.html.twig
new file mode 100644
index 00000000..d4e67d48
--- /dev/null
+++ b/templates/job-order/cmb.popup.html.twig
@@ -0,0 +1,13 @@
+{% set cust = jo.getCustomer %}
+{% set cv = jo.getCustomerVehicle %}
+<strong>{{ cust.getNameDisplay }}</strong><br>
+{{ cv.getPlateNumber }}<br>
+<a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
+{{ jo.getServiceTypeName }}<br>
+{{ jo.getStatusText }}
+{% if jo.getRider != null %}
+<br><br>
+{% set rider = jo.getRider %}
+{{ rider.getFullName }}<br>
+{{ rider.getPlateNumber }}
+{% endif %}
diff --git a/templates/job-order/popup.html.twig b/templates/job-order/popup.html.twig
index d4e67d48..b7e96f04 100644
--- a/templates/job-order/popup.html.twig
+++ b/templates/job-order/popup.html.twig
@@ -2,7 +2,7 @@
 {% set cv = jo.getCustomerVehicle %}
 <strong>{{ cust.getNameDisplay }}</strong><br>
 {{ cv.getPlateNumber }}<br>
-<a href="{{ url('jo_onestep_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
+<a href="{{ url('jo_open_edit_form', {'id': jo.getID}) }}">Job Order #{{ jo.getID }}</a><br>
 {{ jo.getServiceTypeName }}<br>
 {{ jo.getStatusText }}
 {% if jo.getRider != null %}