diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 715cdad14..93d088cbc 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -12102,6 +12102,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>cancel</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>confirmpassword</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index 8e41fcee6..bd2085c49 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -191,7 +191,10 @@ function BillEnterModalContainer({
   };
 
   const handleCancel = () => {
-    toggleModalVisible();
+    const r = window.confirm(t("general.labels.cancel"));
+    if (r === true) {
+      toggleModalVisible();
+    }
   };
 
   useEffect(() => {
@@ -227,6 +230,7 @@ function BillEnterModalContainer({
       width={"90%"}
       visible={billEnterModal.visible}
       okText={t("general.actions.save")}
+      keyboard="false"
       onOk={() => form.submit()}
       onCancel={handleCancel}
       afterClose={() => form.resetFields()}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index df051be15..cde10cc5c 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -778,6 +778,7 @@
 				"actions": "Actions",
 				"areyousure": "Are you sure?",
 				"barcode": "Barcode",
+				"cancel": "Are you sure you want to cancel? Your changes will not be saved.",
 				"confirmpassword": "Confirm Password",
 				"email": "Email",
 				"errors": "Errors",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index b61d27ce0..d5cc45a58 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -778,6 +778,7 @@
 				"actions": "Comportamiento",
 				"areyousure": "",
 				"barcode": "código de barras",
+				"cancel": "",
 				"confirmpassword": "",
 				"email": "",
 				"errors": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 841193043..072e272cc 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -778,6 +778,7 @@
 				"actions": "actes",
 				"areyousure": "",
 				"barcode": "code à barre",
+				"cancel": "",
 				"confirmpassword": "",
 				"email": "",
 				"errors": "",