diff --git a/classes/wc-gateway-braintree-angelleye.php b/classes/wc-gateway-braintree-angelleye.php
index 4f9b07d5b..8ea6714a6 100644
--- a/classes/wc-gateway-braintree-angelleye.php
+++ b/classes/wc-gateway-braintree-angelleye.php
@@ -440,7 +440,7 @@ public function payment_fields() {
                     <div id="braintree-payment-form"></div>
                 </fieldset>
             </div>
-            <?php if (is_ajax()) { ?>
+            <?php if (is_ajax() || is_checkout_pay_page()) { ?>
                 <script type="text/javascript">
                     (function ($) {
                         $(function () {
@@ -450,7 +450,7 @@ public function payment_fields() {
                             });
                             var button = document.querySelector('#place_order');
                             var $form = $('form.checkout, #order_review');
-                            var ccForm = $('form.checkout');
+                            var ccForm = $('form.checkout, #order_review');
                             var clientToken = "<?php echo $clientToken; ?>";
                             braintree.dropin.create({
                                 authorization: clientToken,
@@ -515,6 +515,12 @@ function is_angelleye_braintree_selected() {
                         $('form.checkout').on('checkout_place_order_braintree', function () {
                             return braintreeFormHandler();
                         });
+                        $( 'form#order_review' ).on( 'submit', function () {
+                            return braintreeFormHandler();
+                        });
+                        $( 'form#add_payment_method' ).on( 'submit', function () {
+                             return braintreeFormHandler();
+                        });
                         function braintreeFormHandler() {
                             if ($('#payment_method_braintree').is(':checked')) {
                                 if (0 === $('input.braintree-token').size()) {