diff --git a/css/80_app.css b/css/80_app.css
index da31692a24..edd94ac5bf 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -1039,6 +1039,10 @@ button.save.has-count .count::before {
     border-radius: 8px;
 }
 
+.inspector-preset .preset-form:empty {
+    display: none;
+}
+
 .entity-editor-pane .preset-list-item .preset-list-button-wrap {
     margin-bottom: 0;
 }
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 3c603245bc..ead82bb639 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1086,6 +1086,7 @@
             "key": "name",
             "type": "localized",
             "label": "Name",
+            "universal": true,
             "placeholder": "Common name (if any)"
         },
         "natural": {
diff --git a/data/presets/fields/name.json b/data/presets/fields/name.json
index 361701ce1f..8ee1bd1015 100644
--- a/data/presets/fields/name.json
+++ b/data/presets/fields/name.json
@@ -2,5 +2,6 @@
     "key": "name",
     "type": "localized",
     "label": "Name",
+    "universal": true,
     "placeholder": "Common name (if any)"
 }
diff --git a/modules/ui/preset.js b/modules/ui/preset.js
index 4e93d47703..fd1defff13 100644
--- a/modules/ui/preset.js
+++ b/modules/ui/preset.js
@@ -40,7 +40,7 @@ export function uiPreset(context) {
         field.show = show;
 
         field.shown = function() {
-            return field.id === 'name' || field.show || _.some(field.keys, function(key) { return !!tags[key]; });
+            return field.show || _.some(field.keys, function(key) { return !!tags[key]; });
         };
 
         field.modified = function() {
@@ -105,10 +105,6 @@ export function uiPreset(context) {
 
             fieldsArr = [];
 
-            if (presets.field('name')) {
-                fieldsArr.push(UIField(presets.field('name'), entity));
-            }
-
             preset.fields.forEach(function(field) {
                 if (field.matchGeometry(geometry)) {
                     fieldsArr.push(UIField(field, entity, true));