diff --git a/addons/website_sale/static/src/js/website_sale_payment.js b/addons/website_sale/static/src/js/website_sale_payment.js
index 55e0d186b23..5ceb1fbfb9a 100644
--- a/addons/website_sale/static/src/js/website_sale_payment.js
+++ b/addons/website_sale/static/src/js/website_sale_payment.js
@@ -5,7 +5,7 @@ $(document).ready(function () {
     // If option is enable
     if ($("#checkbox_cgv").length) {
       $("#checkbox_cgv").click(function() {
-        $("div.o_payment_acquirer_button").find('input, button').prop("disabled", !this.checked);
+        $("button#o_payment_form_pay").prop("disabled", !this.checked);
       });
     }
 });
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 44631c7a3f7..fc9fdf907ae 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1368,7 +1368,7 @@
     </template>
 
     <template id="payment_sale_note" inherit_id="payment" name="Accept Terms &amp; Conditions" customize_show="True" active="False">
-        <xpath expr="//t[@id='acquirers_list']" position="before">
+        <xpath expr="//div[@id='payment_method']" position="before">
             <div class="oe_accept_cgv_button">
                 <label>
                     <input type="checkbox" checked="checked" id="checkbox_cgv" />