diff --git a/addons/sale/controllers/portal.py b/addons/sale/controllers/portal.py
index 7d0ee178db2..af7078619e6 100644
--- a/addons/sale/controllers/portal.py
+++ b/addons/sale/controllers/portal.py
@@ -169,6 +169,7 @@ class CustomerPortal(CustomerPortal):
             'bootstrap_formatting': True,
             'partner_id': order_sudo.partner_id.id,
             'report_type': 'html',
+            'action': order_sudo._get_portal_return_action(),
         }
         if order_sudo.company_id:
             values['res_company'] = order_sudo.company_id
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index f081041715e..4dfd96f2387 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -904,6 +904,11 @@ class SaleOrder(models.Model):
         self.ensure_one()
         return 'form_save' if self.require_payment else 'form'
 
+    def _get_portal_return_action(self):
+        """ Return the action used to display orders when returning from customer portal. """
+        self.ensure_one()
+        return self.env.ref('sale.action_quotations_with_onboarding')
+
 
 class SaleOrderLine(models.Model):
     _name = 'sale.order.line'
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index 2244a36b72f..c7f934ea695 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -117,7 +117,7 @@
         <xpath expr="//div[hasclass('o_portal_sidebar')]" position="inside">
             <t t-set="o_portal_fullwidth_alert" groups="sales_team.group_sale_salesman">
                 <t t-call="portal.portal_back_in_edit_mode">
-                    <t t-set="backend_url" t-value="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;action=%s&amp;view_type=form' % (sale_order._name, sale_order.id, sale_order.env.ref('sale.action_quotations_with_onboarding').id)"/>
+                    <t t-set="backend_url" t-value="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;action=%s&amp;view_type=form' % (sale_order._name, sale_order.id, action.id)"/>
                 </t>
             </t>