diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index 68437777ee2..19a7b60b964 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -118,12 +118,13 @@ const app = new Vue({
 
     methods: {
         onChangeCurrencyPaymentAccount(currency_code) {
+            let code = currency_code;
+            let rate = this.form.currency_rate;
+            let precision = this.currency.precision;
+
             let amount = parseFloat(this.form.document_default_amount).toFixed(precision);
             let paid_amount = parseFloat(this.form.paid_amount).toFixed(precision);
             let total_amount = parseFloat(amount - paid_amount).toFixed(precision);
-            let code = currency_code;
-            let rate = this.form.currency_rate;    
-            let precision = this.currency.precision;
             let error_amount = 0;
 
             if (this.form.document_currency_code != code) {
@@ -160,7 +161,7 @@ const app = new Vue({
             let code = this.form.currency_code;
 
             if (this.form.document_currency_code != code) {
-                let rate = this.form.currency_rate;
+                let rate = (this.form.pay_in_full) ? parseFloat(this.form.amount / this.form.document_default_amount).toFixed(4): this.form.currency_rate;
                 let precision = this.currency.precision;
                 let paid_amount = parseFloat(this.form.paid_amount).toFixed(precision);
                 let total_amount = parseFloat(amount - paid_amount).toFixed(precision); 
@@ -183,11 +184,13 @@ const app = new Vue({
             }
         },
 
-        onChangeRatePayment() {
-
+        onChangeRatePayment(rate) {
+            this.onChangeAmount(this.form.amount);
         },
 
         onChangePayInFull(event) {
+            this.$forceUpdate();
+
             if (! event) {
                 return;
             }
@@ -195,6 +198,8 @@ const app = new Vue({
             let rate = parseFloat(this.form.amount / this.form.document_default_amount).toFixed(4);
 
             this.form.currency_rate = rate;
+
+            this.onChangeAmount(this.form.amount);
         },
 
         checkAmount() {
diff --git a/resources/views/modals/documents/payment.blade.php b/resources/views/modals/documents/payment.blade.php
index 4cf25fb5d62..a1c61b6cdcc 100644
--- a/resources/views/modals/documents/payment.blade.php
+++ b/resources/views/modals/documents/payment.blade.php
@@ -88,7 +88,7 @@
                             form-group-class="col-span-6"
                             ::disabled="form.pay_in_full"
                             not-required
-                            @change="onChangeRatePayment($event)"
+                            @input="onChangeRatePayment($event)"
                         />
 
                         <div class="relative col-span-6 text-xs flex mt-2">