diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index 8dbbea355270..9c5ba7359896 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -1133,7 +1133,7 @@
     	});
 
 		this.totals.rawPaidToDate = ko.computed(function() {
-			return self.amount() - self.balance();		    
+			return accounting.toFixed(self.amount(),2) - accounting.toFixed(self.balance(),2);		    
 		});
 
 		this.totals.paidToDate = ko.computed(function() {
@@ -1142,7 +1142,7 @@
 		});
 
 		this.totals.total = ko.computed(function() {
-		    var total = self.totals.rawSubtotal();
+		    var total = accounting.toFixed(self.totals.rawSubtotal(),2);
 
 		    var discount = parseFloat(self.discount());
 		    if (discount > 0) {
@@ -1517,4 +1517,4 @@
 
 	</script>
 
-@stop
\ No newline at end of file
+@stop
diff --git a/public/built.js b/public/built.js
index 216c06fd24e1..a9b5eb281d9d 100644
--- a/public/built.js
+++ b/public/built.js
@@ -36967,7 +36967,7 @@ function calculateAmounts(invoice) {
     total = parseFloat(total) + parseFloat(tax);
   }
 
-  invoice.balance_amount = total - (invoice.amount - invoice.balance);
+  invoice.balance_amount = total.toFixed(4) - (accounting.toFixed(invoice.amount, 2) - accounting.toFixed(invoice.balance, 2));
   invoice.tax_amount = tax;
   invoice.discount_amount = discount;
   invoice.has_taxes = hasTaxes;
diff --git a/public/js/script.js b/public/js/script.js
index 2d38f1a898bc..b5708250082a 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1500,7 +1500,7 @@ function calculateAmounts(invoice) {
     total = parseFloat(total) + parseFloat(tax);
   }
 
-  invoice.balance_amount = total - (invoice.amount - invoice.balance);
+  invoice.balance_amount = total.toFixed(4) - (accounting.toFixed(invoice.amount, 2) - accounting.toFixed(invoice.balance, 2));
   invoice.tax_amount = tax;
   invoice.discount_amount = discount;
   invoice.has_taxes = hasTaxes;