diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index bff79ce863..b21d1a2f79 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -363,7 +363,8 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
               title: Strings.ADD_PLACE_TITLE,
               message: modal_body,
               closeButton: false,
-              buttons: modal_buttons
+              buttons: modal_buttons,
+              onEscape: true
             });
           } else {
             bootbox.alert(Strings.ADD_PLACE_UNABLE_TO_LOAD_ERROR);
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 419b55685f..c24e2879ef 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -652,6 +652,7 @@ function setupDomainLabelSetting() {
       title: 'Edit Label',
       message: modal_body,
       closeButton: false,
+      onEscape: true,
       buttons: [
         {
           label: 'Cancel',
@@ -775,6 +776,7 @@ function setupDomainNetworkingSettings() {
       title: 'Edit Network',
       message: modal_body,
       closeButton: false,
+      onEscape: true,
       buttons: [
         {
           label: 'Cancel',
@@ -922,6 +924,7 @@ function placeTableRow(name, path, isTemporary, placeID) {
     var dialog = bootbox.dialog({
       message: confirmString,
       closeButton: false,
+      onEscape: true,
       buttons: [
         {
           label: Strings.REMOVE_PLACE_CANCEL_BUTTON,
@@ -1096,6 +1099,7 @@ function editHighFidelityPlace(placeID, name, path) {
   dialog = bootbox.dialog({
     title: Strings.EDIT_PLACE_TITLE,
     closeButton: false,
+    onEscape: true,
     message: modal_body,
     buttons: modal_buttons
   })
@@ -1178,6 +1182,7 @@ function chooseFromHighFidelityDomains(clickedButton) {
 
         bootbox.dialog({
           title: "Choose matching domain",
+          onEscape: true,
           message: modal_body,
           buttons: modal_buttons
         })