diff --git a/modules/renderer/map.js b/modules/renderer/map.js
index 4de095adb..df2f58edc 100644
--- a/modules/renderer/map.js
+++ b/modules/renderer/map.js
@@ -887,16 +887,16 @@ export function rendererMap(context) {
 
 
     map.editable = function() {
-        var osmLayer = surface.selectAll('.data-layer.osm');
-        if (!osmLayer.empty() && osmLayer.classed('disabled')) return false;
+        var layer = context.layers().layer('osm');
+        if (!layer || !layer.enabled()) return false;
 
         return map.zoom() >= context.minEditableZoom();
     };
 
 
     map.notesEditable = function() {
-        var noteLayer = surface.selectAll('.data-layer.notes');
-        if (!noteLayer.empty() && noteLayer.classed('disabled')) return false;
+        var layer = context.layers().layer('notes');
+        if (!layer || !layer.enabled()) return false;
 
         return map.zoom() >= context.minEditableZoom();
     };
diff --git a/modules/svg/osm.js b/modules/svg/osm.js
index 7eee64afe..c585d8c20 100644
--- a/modules/svg/osm.js
+++ b/modules/svg/osm.js
@@ -48,9 +48,9 @@ export function svgOsm(projection, context, dispatch) {
     }
 
 
-    drawOsm.enabled = function(_) {
+    drawOsm.enabled = function(val) {
         if (!arguments.length) return enabled;
-        enabled = _;
+        enabled = val;
 
         if (enabled) {
             showLayer();