diff --git a/lib/ui/app/invoice/tax_rate_dropdown.dart b/lib/ui/app/invoice/tax_rate_dropdown.dart
index 801910081..83a9ae418 100644
--- a/lib/ui/app/invoice/tax_rate_dropdown.dart
+++ b/lib/ui/app/invoice/tax_rate_dropdown.dart
@@ -29,6 +29,8 @@ class _TaxRateDropdownState extends State<TaxRateDropdown> {
 
   @override
   void didChangeDependencies() {
+    print('TAX didChangeDependencies...');
+
     final taxRates = widget.taxRates;
 
     _selectedTaxRate = taxRates.firstWhere(
diff --git a/lib/ui/payment/edit/payment_edit_vm.dart b/lib/ui/payment/edit/payment_edit_vm.dart
index cb673bfee..fea028387 100644
--- a/lib/ui/payment/edit/payment_edit_vm.dart
+++ b/lib/ui/payment/edit/payment_edit_vm.dart
@@ -35,6 +35,7 @@ class PaymentEditScreen extends StatelessWidget {
       builder: (context, viewModel) {
         return PaymentEdit(
           viewModel: viewModel,
+          //key: ValueKey(viewModel.payment.id),
         );
       },
     );
diff --git a/lib/ui/product/edit/product_edit.dart b/lib/ui/product/edit/product_edit.dart
index f53d9ee52..0d77dd5b1 100644
--- a/lib/ui/product/edit/product_edit.dart
+++ b/lib/ui/product/edit/product_edit.dart
@@ -145,9 +145,9 @@ class _ProductEditState extends State<ProductEdit> {
         body: Form(
           key: _formKey,
           child: ListView(
-            key: ValueKey(viewModel.product.id),
             children: <Widget>[
               FormCard(
+                key: ValueKey(widget.viewModel.product.id),
                 children: <Widget>[
                   TextFormField(
                     key: Key(ProductKeys.productKey),
diff --git a/lib/ui/product/edit/product_edit_vm.dart b/lib/ui/product/edit/product_edit_vm.dart
index 4edc41e92..d7faf77af 100644
--- a/lib/ui/product/edit/product_edit_vm.dart
+++ b/lib/ui/product/edit/product_edit_vm.dart
@@ -26,6 +26,7 @@ class ProductEditScreen extends StatelessWidget {
       builder: (context, vm) {
         return ProductEdit(
           viewModel: vm,
+          key: ValueKey(vm.product.id),
         );
       },
     );
diff --git a/lib/ui/project/edit/project_edit_vm.dart b/lib/ui/project/edit/project_edit_vm.dart
index ce3d39fd1..80c376537 100644
--- a/lib/ui/project/edit/project_edit_vm.dart
+++ b/lib/ui/project/edit/project_edit_vm.dart
@@ -33,6 +33,7 @@ class ProjectEditScreen extends StatelessWidget {
       builder: (context, viewModel) {
         return ProjectEdit(
           viewModel: viewModel,
+          key: ValueKey(viewModel.project.id),
         );
       },
     );