diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index ae79e8a141f..3411fb3e3b9 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -969,6 +969,9 @@ class WebsiteSale(ProductConfiguratorController):
         if not order or (order.amount_total and not tx):
             return request.redirect('/shop')
 
+        if order and not order.amount_total and not tx:
+            return request.redirect(order.get_portal_url())
+
         # clean context and session, then redirect to the confirmation page
         request.website.sale_reset()
         if tx and tx.state == 'draft':
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index e9ed17c7f52..5b89ad4982b 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1364,7 +1364,7 @@
                             <div class="js_payment mt-3" t-if="not website_sale_order.amount_total" id="payment_method">
                                 <form target="_self" action="/shop/payment/validate" method="post" class="float-right">
                                     <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()" />
-                                    <a role="button" class="btn btn-primary a-submit">
+                                    <a role="button" class="btn btn-primary a-submit" href="#">
                                         <span t-if="order.amount_total &gt; 0">Pay Now <span class="fa fa-chevron-right"></span></span>
                                         <span t-if="order.amount_total == 0">Confirm Order <span class="fa fa-chevron-right"></span></span>
                                     </a>