diff --git a/lib/ui/locations/view.mjs b/lib/ui/locations/view.mjs
index b032f4e8ad..03a193ff5f 100644
--- a/lib/ui/locations/view.mjs
+++ b/lib/ui/locations/view.mjs
@@ -99,7 +99,7 @@ export default location => {
       <button
         title = "Enable edits"
         class = ${`mask-icon edit ${location.new && 'on' || ''}`}
-        onclick = ${e => {
+        onclick = ${async e => {
 
         // Edits are on
         if (e.target.classList.contains('on')) {
@@ -107,8 +107,18 @@ export default location => {
           // Remove on class from button.
           e.target.classList.remove('on')
 
-          // Remove edits from infoj entries.
-          location.removeEdits()
+          if (location.infoj.some(entry => typeof entry.newValue !== 'undefined')) {
+
+            if (confirm(`Save your changes to this location?`)) {
+
+              await location.update()
+
+            } else {
+
+              // Remove edits from infoj entries.
+              location.removeEdits()
+            }
+          }
 
         } else {
 
@@ -170,9 +180,22 @@ export default location => {
     <button
       title = ${mapp.dictionary.location_remove}
       class = "mask-icon close no"
-      onclick = ${e => {
-      location.remove()
-      // location.layer.mapview.Map.updateSize()
+      onclick = ${async e => {
+
+        if (location.infoj.some(entry => typeof entry.newValue !== 'undefined')) {
+
+          if (confirm(`Save your changes to this location?`)) {
+
+            await location.update()
+
+          } else {
+
+            // The location will not be closed.
+            return;
+          }
+        }
+
+        location.remove()
     }}>`)
 
   location.view = mapp.ui.elements.drawer({
@@ -207,10 +230,10 @@ export default location => {
     }
 
     // Hide upload button if no other field in the infoj has a newValue.
-    location.view.querySelector('.btn-save')
-      .style.display = location.infoj
-        .some(entry => typeof entry.newValue !== 'undefined')
-      && 'inline-block' || 'none';
+    location.view.querySelector('.btn-save').style.display =
+      location.infoj.some(entry => typeof entry.newValue !== 'undefined')
+        ? 'inline-block'
+        : 'none';
 
   })