diff --git a/lib/ui/client/edit/client_edit.dart b/lib/ui/client/edit/client_edit.dart
index 257685244..9011a2cd7 100644
--- a/lib/ui/client/edit/client_edit.dart
+++ b/lib/ui/client/edit/client_edit.dart
@@ -51,9 +51,18 @@ class _ClientEditState extends State<ClientEdit>
       title: client.isNew ? localization.newClient : localization.editClient,
       onCancelPressed: (context) => viewModel.onCancelPressed(context),
       onSavePressed: (context) {
-        if (!_formKey.currentState.validate()) {
+        final bool isValid = _formKey.currentState.validate();
+
+        /*
+        setState(() {
+          autoValidate = !isValid ?? false;
+        });
+         */
+
+        if (!isValid) {
           return;
         }
+
         viewModel.onSavePressed(context);
       },
       appBarBottom: TabBar(
diff --git a/lib/ui/credit/edit/credit_edit.dart b/lib/ui/credit/edit/credit_edit.dart
index 98b3e35f7..f75029108 100644
--- a/lib/ui/credit/edit/credit_edit.dart
+++ b/lib/ui/credit/edit/credit_edit.dart
@@ -73,11 +73,19 @@ class _CreditEditState extends State<CreditEdit>
       title: invoice.isNew ? localization.newCredit : localization.editCredit,
       onCancelPressed: (context) => viewModel.onCancelPressed(context),
       onSavePressed: (context) {
-        if (!_formKey.currentState.validate()) {
+        final bool isValid = _formKey.currentState.validate();
+
+        /*
+        setState(() {
+          autoValidate = !isValid ?? false;
+        });
+         */
+
+        if (!isValid) {
           return;
         }
 
-        widget.viewModel.onSavePressed(context);
+        viewModel.onSavePressed(context);
       },
       appBarBottom: state.prefState.isDesktop
           ? null
diff --git a/lib/ui/document/edit/document_edit.dart b/lib/ui/document/edit/document_edit.dart
index efd7a8f8f..b892baaf3 100644
--- a/lib/ui/document/edit/document_edit.dart
+++ b/lib/ui/document/edit/document_edit.dart
@@ -75,9 +75,18 @@ class _DocumentEditState extends State<DocumentEdit> {
       title:
           document.isNew ? localization.newDocument : localization.editDocument,
       onSavePressed: (context) {
-        if (!_formKey.currentState.validate()) {
+        final bool isValid = _formKey.currentState.validate();
+
+        /*
+        setState(() {
+          autoValidate = !isValid ?? false;
+        });
+         */
+
+        if (!isValid) {
           return;
         }
+
         viewModel.onSavePressed(context);
       },
       body: Form(
diff --git a/lib/ui/expense/edit/expense_edit.dart b/lib/ui/expense/edit/expense_edit.dart
index e5af74cf5..9321c2430 100644
--- a/lib/ui/expense/edit/expense_edit.dart
+++ b/lib/ui/expense/edit/expense_edit.dart
@@ -48,9 +48,18 @@ class _ExpenseEditState extends State<ExpenseEdit>
       title: expense.isNew ? localization.newExpense : localization.editExpense,
       onCancelPressed: (context) => viewModel.onCancelPressed(context),
       onSavePressed: (context) {
-        if (!_formKey.currentState.validate()) {
+        final bool isValid = _formKey.currentState.validate();
+
+        /*
+        setState(() {
+          autoValidate = !isValid ?? false;
+        })
+         */
+
+        if (!isValid) {
           return;
         }
+
         viewModel.onSavePressed(context);
       },
       appBarBottom: TabBar(
diff --git a/lib/ui/group/edit/group_edit.dart b/lib/ui/group/edit/group_edit.dart
index 556364061..e79fcddc8 100644
--- a/lib/ui/group/edit/group_edit.dart
+++ b/lib/ui/group/edit/group_edit.dart
@@ -79,9 +79,16 @@ class _GroupEditState extends State<GroupEdit> {
       onCancelPressed: (context) => viewModel.onCancelPressed(context),
       title: group.isNew ? localization.newGroup : localization.editGroup,
       onSavePressed: (context) {
-        if (!_formKey.currentState.validate()) {
+        final bool isValid = _formKey.currentState.validate();
+
+        setState(() {
+          autoValidate = !isValid ?? false;
+        });
+
+        if (!isValid) {
           return;
         }
+
         viewModel.onSavePressed(context);
       },
       body: Form(
diff --git a/lib/ui/invoice/edit/invoice_edit.dart b/lib/ui/invoice/edit/invoice_edit.dart
index 48519e66e..2e593c317 100644
--- a/lib/ui/invoice/edit/invoice_edit.dart
+++ b/lib/ui/invoice/edit/invoice_edit.dart
@@ -78,11 +78,19 @@ class _InvoiceEditState extends State<InvoiceEdit>
       title: invoice.isNew ? localization.newInvoice : localization.editInvoice,
       onCancelPressed: (context) => viewModel.onCancelPressed(context),
       onSavePressed: (context) {
-        if (!_formKey.currentState.validate()) {
+        final bool isValid = _formKey.currentState.validate();
+
+        /*
+        setState(() {
+          autoValidate = !isValid ?? false;
+        });
+         */
+
+        if (!isValid) {
           return;
         }
 
-        widget.viewModel.onSavePressed(context);
+        viewModel.onSavePressed(context);
       },
       appBarBottom: state.prefState.isDesktop
           ? null
diff --git a/lib/ui/quote/quote_edit.dart b/lib/ui/quote/quote_edit.dart
index fbff73764..7dc3ae848 100644
--- a/lib/ui/quote/quote_edit.dart
+++ b/lib/ui/quote/quote_edit.dart
@@ -73,11 +73,19 @@ class _QuoteEditState extends State<QuoteEdit>
       title: invoice.isNew ? localization.newQuote : localization.editQuote,
       onCancelPressed: (context) => viewModel.onCancelPressed(context),
       onSavePressed: (context) {
-        if (!_formKey.currentState.validate()) {
+        final bool isValid = _formKey.currentState.validate();
+
+        /*
+        setState(() {
+          autoValidate = !isValid ?? false;
+        });
+         */
+
+        if (!isValid) {
           return;
         }
 
-        widget.viewModel.onSavePressed(context);
+        viewModel.onSavePressed(context);
       },
       appBarBottom: state.prefState.isDesktop
           ? null
diff --git a/lib/ui/task/edit/task_edit.dart b/lib/ui/task/edit/task_edit.dart
index 286958fc0..563937d32 100644
--- a/lib/ui/task/edit/task_edit.dart
+++ b/lib/ui/task/edit/task_edit.dart
@@ -74,11 +74,19 @@ class _TaskEditState extends State<TaskEdit>
       title: task.isNew ? localization.newTask : localization.editTask,
       onCancelPressed: (context) => viewModel.onCancelPressed(context),
       onSavePressed: (context) {
-        if (!_formKey.currentState.validate()) {
+        final bool isValid = _formKey.currentState.validate();
+
+        /*
+        setState(() {
+          autoValidate = !isValid ?? false;
+        });
+         */
+
+        if (!isValid) {
           return;
         }
 
-        widget.viewModel.onSavePressed(context);
+        viewModel.onSavePressed(context);
       },
       appBarBottom: TabBar(
         controller: _controller,
diff --git a/lib/ui/user/edit/user_edit.dart b/lib/ui/user/edit/user_edit.dart
index 465cc2f3e..8c40cf325 100644
--- a/lib/ui/user/edit/user_edit.dart
+++ b/lib/ui/user/edit/user_edit.dart
@@ -138,9 +138,16 @@ class _UserEditState extends State<UserEdit>
       ),
       onCancelPressed: (context) => viewModel.onCancelPressed(context),
       onSavePressed: (context) {
-        if (!_formKey.currentState.validate()) {
+        final bool isValid = _formKey.currentState.validate();
+
+        setState(() {
+          autoValidate = !isValid ?? false;
+        });
+
+        if (!isValid) {
           return;
         }
+
         viewModel.onSavePressed(context);
       },
       body: AppTabForm(
diff --git a/lib/ui/vendor/edit/vendor_edit.dart b/lib/ui/vendor/edit/vendor_edit.dart
index d01cb2434..a7223e399 100644
--- a/lib/ui/vendor/edit/vendor_edit.dart
+++ b/lib/ui/vendor/edit/vendor_edit.dart
@@ -49,9 +49,18 @@ class _VendorEditState extends State<VendorEdit>
       title: vendor.isNew ? localization.newVendor : localization.editVendor,
       onCancelPressed: (context) => viewModel.onCancelPressed(context),
       onSavePressed: (context) {
-        if (!_formKey.currentState.validate()) {
+        final bool isValid = _formKey.currentState.validate();
+
+        /*
+        setState(() {
+          autoValidate = !isValid ?? false;
+        });
+         */
+
+        if (!isValid) {
           return;
         }
+
         viewModel.onSavePressed(context);
       },
       appBarBottom: TabBar(