diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py
index 7f888536..4496a21a 100644
--- a/atst/routes/task_orders/new.py
+++ b/atst/routes/task_orders/new.py
@@ -22,10 +22,10 @@ def render_task_orders_edit(template, portfolio_id=None, task_order_id=None, for
         render_args["form"] = form or TaskOrderForm()
 
     render_args["cancel_save_url"] = url_for(
-        "task_orders.portfolio_funding", portfolio_id=portfolio_id, save=True
+        "task_orders.cancel_edit", task_order_id=task_order_id, portfolio_id=portfolio_id, save=True
     )
     render_args["cancel_discard_url"] = url_for(
-        "task_orders.portfolio_funding", portfolio_id=portfolio_id
+        "task_orders.cancel_edit", task_order_id=task_order_id, portfolio_id=portfolio_id
     )
 
     return render_template(template, **render_args)
diff --git a/templates/task_orders/builder_base.html b/templates/task_orders/builder_base.html
index c1931693..4319e06b 100644
--- a/templates/task_orders/builder_base.html
+++ b/templates/task_orders/builder_base.html
@@ -37,8 +37,8 @@
       {% call Modal(name='cancel', dismissable=True) %}
         <div class="task-order__modal-cancel">
           <h1>Do you want to save this draft?</h1>
-          <a href="{{ cancel_discard_url }}" class="action-group__action icon-link">No, delete it</a>
-          <a href="{{ cancel_save_url }}" class="action-group__action icon-link">Yes, save for later</a>
+          <button formaction="{{ cancel_discard_url }}" class="usa-button usa-button-primary" type="submit">No, delete it</button>
+          <button formaction="{{ cancel_save_url }}" class="usa-button usa-button-primary" type="submit">Yes, save for later</button>
         </div>
       {% endcall %}