diff --git a/umap/static/umap/js/modules/rendering/ui.js b/umap/static/umap/js/modules/rendering/ui.js
index b496a5449..c01d309e2 100644
--- a/umap/static/umap/js/modules/rendering/ui.js
+++ b/umap/static/umap/js/modules/rendering/ui.js
@@ -32,7 +32,9 @@ const FeatureMixin = {
     if (map.editedFeature === this.feature) {
       this.feature._marked_for_deletion = true
       this.feature.endEdit()
-      map.editPanel.close()
+      if (map.editedFeature === this.feature) {
+        map.editPanel.close()
+      }
     }
   },
 
diff --git a/umap/static/umap/js/modules/ui/panel.js b/umap/static/umap/js/modules/ui/panel.js
index 6fa77e601..ec6dd530d 100644
--- a/umap/static/umap/js/modules/ui/panel.js
+++ b/umap/static/umap/js/modules/ui/panel.js
@@ -25,6 +25,9 @@ export class Panel {
   }
 
   open({ content, className, actions = [] } = {}) {
+    if (this.isOpen()) {
+      this.onClose()
+    }
     this.container.className = `with-transition panel window ${this.className} ${
       this.mode || ''
     }`
@@ -71,10 +74,13 @@ export class Panel {
 
   close() {
     document.body.classList.remove(`panel-${this.className.split(' ')[0]}-on`)
+    this.onClose()
+  }
+
+  onClose() {
     if (DomUtil.hasClass(this.container, 'on')) {
       DomUtil.removeClass(this.container, 'on')
       this.map.invalidateSize({ pan: false })
-      this.map.editedFeature = null
     }
   }
 }
@@ -84,6 +90,11 @@ export class EditPanel extends Panel {
     super(map)
     this.className = 'right dark'
   }
+
+  onClose() {
+    super.onClose()
+    this.map.editedFeature = null
+  }
 }
 
 export class FullPanel extends Panel {
diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js
index f147c04d6..c6e85e12b 100644
--- a/umap/static/umap/js/umap.controls.js
+++ b/umap/static/umap/js/umap.controls.js
@@ -666,7 +666,7 @@ const ControlsMixin = {
       const connectedPeersCount = L.DomUtil.createButton(
         'leaflet-control-connected-peers',
         rightContainer,
-        '',
+        ''
       )
       L.DomEvent.on(connectedPeersCount, 'mouseover', () => {
         this.tooltip.open({
@@ -1182,17 +1182,6 @@ U.Editable = L.Editable.extend({
   initialize: function (map, options) {
     L.Editable.prototype.initialize.call(this, map, options)
     this.on('editable:drawing:click editable:drawing:move', this.drawingTooltip)
-    this.on('editable:drawing:end', (event) => {
-      this.map.tooltip.close()
-      // Leaflet.Editable will delete the drawn shape if invalid
-      // (eg. line has only one drawn point)
-      // So let's check if the layer has no more shape
-      if (!event.layer.feature.hasGeom()) {
-        event.layer.feature.del()
-      } else {
-        event.layer.feature.edit()
-      }
-    })
     // Layer for items added by users
     this.on('editable:drawing:cancel', (event) => {
       if (event.layer instanceof U.LeafletMarker) event.layer.feature.del()
@@ -1322,4 +1311,19 @@ U.Editable = L.Editable.extend({
     L.DomEvent.stop(e)
     e.cancel()
   },
+
+  onEscape: function () {
+    this.once('editable:drawing:end', (event) => {
+      this.map.tooltip.close()
+      // Leaflet.Editable will delete the drawn shape if invalid
+      // (eg. line has only one drawn point)
+      // So let's check if the layer has no more shape
+      if (!event.layer.feature.hasGeom()) {
+        event.layer.feature.del()
+      } else {
+        event.layer.feature.edit()
+      }
+    })
+    this.stopDrawing()
+  },
 })
diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js
index 11305e961..15b928e9d 100644
--- a/umap/static/umap/js/umap.js
+++ b/umap/static/umap/js/umap.js
@@ -563,7 +563,7 @@ U.Map = L.Map.extend({
         if (this.importer.dialog.visible) {
           this.importer.dialog.close()
         } else if (this.editEnabled && this.editTools.drawing()) {
-          this.editTools.stopDrawing()
+          this.editTools.onEscape()
         } else if (this.measureTools.enabled()) {
           this.measureTools.stopDrawing()
         } else if (this.fullPanel?.isOpen()) {