diff --git a/modules/renderer/map.js b/modules/renderer/map.js
index a4ebac8a4..bac563eeb 100644
--- a/modules/renderer/map.js
+++ b/modules/renderer/map.js
@@ -344,7 +344,12 @@ export function rendererMap(context) {
     function editOff() {
         context.features().resetStats();
         surface.selectAll('.layer-osm *').remove();
-        context.enter(modeBrowse(context));
+
+        var mode = context.mode();
+        if (mode && mode.id !== 'save') {
+            context.enter(modeBrowse(context));
+        }
+
         dispatch.call('drawn', this, {full: true});
     }