diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart
index 0066ef404..02df03b10 100644
--- a/lib/data/models/invoice_model.dart
+++ b/lib/data/models/invoice_model.dart
@@ -440,10 +440,19 @@ abstract class InvoiceEntity extends Object
     return actions..addAll(getBaseActions(user: user));
   }
 
-  InvoiceEntity applyTax(TaxRateEntity taxRate) {
-    InvoiceEntity invoice = rebuild((b) => b
-      ..taxRate1 = taxRate.rate
-      ..taxName1 = taxRate.name);
+  InvoiceEntity applyTax(TaxRateEntity taxRate, {bool isSecond = false}) {
+
+    InvoiceEntity invoice;
+
+    if (isSecond) {
+      invoice = rebuild((b) => b
+        ..taxRate2 = taxRate.rate
+        ..taxName2 = taxRate.name);
+    } else {
+      invoice = rebuild((b) => b
+        ..taxRate1 = taxRate.rate
+        ..taxName1 = taxRate.name);
+    }
 
     if (taxRate.isInclusive) {
       invoice = invoice.rebuild((b) => b
diff --git a/lib/main.dart b/lib/main.dart
index 56e47f421..b9fe8ac4f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:intl/intl.dart';
 import 'package:invoiceninja_flutter/.env.dart';
diff --git a/lib/ui/invoice/edit/invoice_edit_details.dart b/lib/ui/invoice/edit/invoice_edit_details.dart
index a4416453f..a18cbe0d8 100644
--- a/lib/ui/invoice/edit/invoice_edit_details.dart
+++ b/lib/ui/invoice/edit/invoice_edit_details.dart
@@ -300,8 +300,8 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
             company.enableInvoiceTaxes && company.enableSecondTaxRate
                 ? TaxRateDropdown(
                     taxRates: company.taxRates,
-                    onSelected: (taxRate) =>
-                        viewModel.onChanged(invoice.applyTax(taxRate)),
+                    onSelected: (taxRate) => viewModel
+                        .onChanged(invoice.applyTax(taxRate, isSecond: true)),
                     labelText: localization.tax,
                     initialTaxName: invoice.taxName2,
                     initialTaxRate: invoice.taxRate2,