diff --git a/src/components/edit/LayerEdit.js b/src/components/edit/LayerEdit.js
index 2696a49ec..fce24438f 100644
--- a/src/components/edit/LayerEdit.js
+++ b/src/components/edit/LayerEdit.js
@@ -98,7 +98,12 @@ const LayerEdit = ({ layer, addLayer, updateLayer, cancelLayer }) => {
         : i18n.t('Add new {{name}} layer', { name })
 
     return (
-        <Modal position="middle" dataTest="layeredit" large>
+        <Modal
+            position="middle"
+            dataTest="layeredit"
+            large
+            onClose={cancelLayer}
+        >
             <ModalTitle>{title}</ModalTitle>
             <ModalContent>
                 <div className={styles.content}>
diff --git a/src/components/layerSources/ManageLayerSourcesModal.js b/src/components/layerSources/ManageLayerSourcesModal.js
index c382a1f29..7d55ba72e 100644
--- a/src/components/layerSources/ManageLayerSourcesModal.js
+++ b/src/components/layerSources/ManageLayerSourcesModal.js
@@ -27,7 +27,12 @@ const ManageLayerSourcesModal = ({ onClose }) => {
     useKeyDown('Escape', onClose)
 
     return (
-        <Modal large position="middle" dataTest="managelayersourcesmodal">
+        <Modal
+            onClose={onClose}
+            large
+            position="middle"
+            dataTest="managelayersourcesmodal"
+        >
             <ModalTitle dataTest="managelayersourcesmodal-title">
                 {i18n.t('Configure available layer sources')}
             </ModalTitle>
@@ -54,7 +59,7 @@ const ManageLayerSourcesModal = ({ onClose }) => {
                     <Button
                         dataTest="managelayersourcesmodal-button"
                         secondary
-                        onClick={() => onClose()}
+                        onClick={onClose}
                     >
                         {i18n.t('Close')}
                     </Button>