diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index 9a9373d5c3..49d8ada561 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -981,6 +981,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
             'default': True,
             'validator': bool,
         },
+
+        'FORMS_CLOSE_USING_ESCAPE': {
+            'name': _('Escape Key Closes Forms'),
+            'description': _('Use the escape key to close modal forms'),
+            'default': False,
+            'validator': bool,
+        }
     }
 
     class Meta:
diff --git a/InvenTree/templates/InvenTree/settings/user_forms.html b/InvenTree/templates/InvenTree/settings/user_forms.html
index 121a0c7143..f5eecc574b 100644
--- a/InvenTree/templates/InvenTree/settings/user_forms.html
+++ b/InvenTree/templates/InvenTree/settings/user_forms.html
@@ -14,6 +14,7 @@
 <div class='row'>
     <table class='table table-striped table-condensed'>
         <tbody>
+            {% include "InvenTree/settings/setting.html" with key="FORMS_CLOSE_USING_ESCAPE" icon="fa-window-close" user_setting=True %}
             {% include "InvenTree/settings/setting.html" with key="PART_SHOW_QUANTITY_IN_FORMS" icon="fa-hashtag" user_setting=True %}
         </tbody>
     </table>
diff --git a/InvenTree/templates/js/translated/modals.js b/InvenTree/templates/js/translated/modals.js
index 96e41fd6ec..698a929390 100644
--- a/InvenTree/templates/js/translated/modals.js
+++ b/InvenTree/templates/js/translated/modals.js
@@ -43,7 +43,7 @@ function createNewModal(options={}) {
     });
 
     var html = `
-    <div class='modal fade modal-fixed-footer modal-primary inventree-modal' role='dialog' id='modal-form-${id}'>
+    <div class='modal fade modal-fixed-footer modal-primary inventree-modal' role='dialog' id='modal-form-${id}' tabindex='-1'>
         <div class='modal-dialog'>
             <div class='modal-content'>
                 <div class="modal-header">
@@ -111,7 +111,7 @@ function createNewModal(options={}) {
 
     $(modal_name).modal({
         backdrop: 'static',
-        keyboard: false,
+        keyboard: user_settings.FORMS_CLOSE_USING_ESCAPE,
     });
 
     // Set labels based on supplied options