diff --git a/lib/ui/invoice/edit/invoice_edit.dart b/lib/ui/invoice/edit/invoice_edit.dart
index 2159ad98d..33c367f58 100644
--- a/lib/ui/invoice/edit/invoice_edit.dart
+++ b/lib/ui/invoice/edit/invoice_edit.dart
@@ -12,6 +12,7 @@ import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_notes_vm.dart'
 import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_pdf_vm.dart';
 import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart';
 import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_item_selector.dart';
+import 'package:invoiceninja_flutter/utils/dialogs.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 
 class InvoiceEdit extends StatefulWidget {
@@ -79,7 +80,16 @@ class _InvoiceEditState extends State<InvoiceEdit>
       return;
     }
 
-    widget.viewModel.onSavePressed(context, action);
+    if (action == EntityAction.cancelInvoice) {
+      confirmCallback(
+          context: context,
+          message: AppLocalization.of(context).cancelInvoice,
+          callback: (_) {
+            widget.viewModel.onSavePressed(context, action);
+          });
+    } else {
+      widget.viewModel.onSavePressed(context, action);
+    }
   }
 
   @override
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index 62af2f726..e353d4c15 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -164,7 +164,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create Project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -2290,7 +2290,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -4430,7 +4430,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -6562,7 +6562,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Създаване на проект',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'Таксата за фактура на стойност :amount ще бъде :total.',
@@ -8710,7 +8710,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': '建立專案',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': ':amount 份發票的費用應為 :total。',
@@ -10820,7 +10820,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -12955,7 +12955,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -15089,7 +15089,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Opret projekt',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -17221,7 +17221,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Project aanmaken',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'De toeslag voor een :amount factuur is :total.',
@@ -19386,7 +19386,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -21518,7 +21518,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Luo projekti',
       'update_project': 'Päivitä projekti',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The palkkio  a :amount lasku would be :total.',
@@ -23653,7 +23653,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Créer un projet',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'Le frais pour une facture de :amount serait de :total.',
@@ -25813,7 +25813,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Créer un projet',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'Les frais pour une facture de :amount serait :total.',
@@ -30239,7 +30239,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Δημιουργία project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample':
@@ -32422,7 +32422,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Crea un Progetto',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'La tariffa per una fattura :amount sarebbe :total.',
@@ -34582,7 +34582,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -36711,7 +36711,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -38844,7 +38844,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -40977,7 +40977,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Креирај проект',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'Надоместокот за :amount фактура би бил :total.',
@@ -43114,7 +43114,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Opprett prosjekt',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -45245,7 +45245,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -47377,7 +47377,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Utwórz projekt',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'Opłata do faktury :amount wynosić będzie :total.',
@@ -49512,7 +49512,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Criar projeto',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'A taxa para uma fatura de :amount seria de :total.',
@@ -51663,7 +51663,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Criar projeto',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'A taxa para :amount nota de pag. deve ser :total.',
@@ -53829,7 +53829,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -55964,7 +55964,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Создать проект',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',
@@ -58097,7 +58097,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Ustvari projekt',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'Provizija od zneska :amount računa bo :total.',
@@ -60231,7 +60231,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Crear proyecto',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample':
@@ -62375,7 +62375,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Crear Proyecto',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample':
@@ -64551,7 +64551,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Skapa projekt',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'Avgift för en :amount Faktura hade blivit :total.',
@@ -66697,7 +66697,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'สร้างโครงการ',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'ค่าธรรมเนียมสำหรับ :amount  ใบแจ้งหนี้จะเป็น :total.',
@@ -68827,7 +68827,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'create_project': 'Create project',
       'update_project': 'Update Project',
       'view_task': 'View Task',
-      'cancel_invoice': 'Cancel',
+      'cancel_invoice': 'Cancel Invoice',
       'changed_status': 'Successfully changed task status',
       'change_status': 'Change Status',
       'fees_sample': 'The fee for a :amount invoice would be :total.',