diff --git a/modules/modes/select.js b/modules/modes/select.js
index 4289a0dc1..10703c4f6 100644
--- a/modules/modes/select.js
+++ b/modules/modes/select.js
@@ -239,6 +239,8 @@ export function modeSelect(context, selectedIDs) {
     mode.enter = function() {
         if (!checkSelectedIDs()) return;
 
+        context.features().forceVisible(selectedIDs);
+
         var operations = _without(_values(Operations), Operations.operationDelete)
             .map(function(o) { return o(selectedIDs, context); })
             .filter(function(o) { return o.available(); });
@@ -546,6 +548,7 @@ export function modeSelect(context, selectedIDs) {
 
         context.map().on('drawn.select', null);
         context.ui().sidebar.hide();
+        context.features().forceVisible([]);
     };
 
 
diff --git a/modules/presets/index.js b/modules/presets/index.js
index 3f832b1fa..bf2452fae 100644
--- a/modules/presets/index.js
+++ b/modules/presets/index.js
@@ -78,6 +78,7 @@ export function presetIndex() {
     };
 
     all.allowsVertex = function(entity, resolver) {
+        if (entity.type !== 'node') return false;
         return resolver.transient(entity, 'vertexMatch', function() {
             var vertexPresets = _index.vertex;
             var match;