diff --git a/src/c3nav/control/templates/control/editor.html b/src/c3nav/control/templates/control/editor.html
index 8b76e855..59e500e5 100644
--- a/src/c3nav/control/templates/control/editor.html
+++ b/src/c3nav/control/templates/control/editor.html
@@ -132,9 +132,10 @@ map.on('editable:drawing:commit', function (e) {
     currently_adding = e.layer;
     $('.leaflet-editbar .current').removeClass('current');
     e.layer.disableEdit();
-    e.layer.bindPopup('<img src="{% static "img/loader.gif" %}">', {
-        closeButton: false
-    }).openPopup();
+    L.popup({
+        closeButton: false,
+        autoClose: false,
+    }).setContent('<img src="{% static "img/loader.gif" %}">').setLatLng(e.layer.getCenter()).openOn(map);
     console.log(e.layer.toGeoJSON());
 }).on('editable:drawing:cancel', function (e) {
     if (currently_drawing === null && currently_adding === null) {