diff --git a/client/src/views/admin/field-manager/edit.js b/client/src/views/admin/field-manager/edit.js
index 66067610fd..98002d61e5 100644
--- a/client/src/views/admin/field-manager/edit.js
+++ b/client/src/views/admin/field-manager/edit.js
@@ -115,8 +115,12 @@ Espo.define('views/admin/field-manager/edit', ['view', 'model'], function (Dep,
                     this.model.populateDefaults();
                 }
 
-                this.createFieldView('varchar', 'name', !this.isNew);
-                this.createFieldView('varchar', 'label');
+                this.createFieldView('varchar', 'name', !this.isNew, {
+                    trim: true
+                });
+                this.createFieldView('varchar', 'label', null, {
+                    trim: true
+                });
 
                 this.params.forEach(function (o) {
                     if (o.hidden) {