diff --git a/client/res/templates/admin/link-manager/modals/edit.tpl b/client/res/templates/admin/link-manager/modals/edit.tpl
index 95b774f9e5..8325fd558a 100644
--- a/client/res/templates/admin/link-manager/modals/edit.tpl
+++ b/client/res/templates/admin/link-manager/modals/edit.tpl
@@ -1,142 +1,147 @@
-<div class="panel panel-default no-side-margin"><div class="panel-body">
+<div class="panel panel-default no-side-margin">
+    <div class="panel-body">
 
-<div class="row">
-	<div class="cell form-group col-md-4 col-md-offset-4" data-name="entityForeign">
-		<label class="control-label" data-name="entityForeign">{{translate 'entityForeign' category='fields' scope='EntityManager'}}</label>
-		<div class="field" data-name="entityForeign">
-			{{{entityForeign}}}
-		</div>
-	</div>
-</div>
-<div class="row">
-	<div class="cell form-group col-md-4 col-md-offset-4" data-name="linkType">
-		<label class="control-label" data-name="linkType">{{translate 'linkType' category='fields' scope='EntityManager'}}</label>
-		<div class="field" data-name="linkType">
-			{{{linkType}}}
-		</div>
-	</div>
-</div>
-<div class="row">
-	<div class="cell form-group col-md-4" data-name="linkForeign">
-		<label class="control-label" data-name="linkForeign">{{translate 'name' category='fields' scope='EntityManager'}}</label>
-		<div class="field" data-name="linkForeign">
-			{{{linkForeign}}}
-		</div>
-	</div>
-	<div class="cell form-group col-md-4" data-name="relationName">
-		{{#if relationName}}
-		<label class="control-label" data-name="relationName">{{translate 'relationName' category='fields' scope='EntityManager'}}</label>
-		<div class="field" data-name="relationName">
-			{{{relationName}}}
-		</div>
-		{{/if}}
-	</div>
-	<div class="cell form-group col-md-4" data-name="link">
-		<label class="control-label" data-name="link">{{translate 'name' category='fields' scope='EntityManager'}}</label>
-		<div class="field" data-name="link">
-			{{{link}}}
-		</div>
-	</div>
-</div>
-<div class="row">
-	<div class="cell form-group col-md-4" data-name="labelForeign">
-		<label class="control-label" data-name="labelForeign">{{translate 'label' category='fields' scope='EntityManager'}}</label>
-		<div class="field" data-name="labelForeign">
-			{{{labelForeign}}}
-		</div>
-	</div>
-	<div class="cell form-group col-md-4"></div>
-	<div class="cell form-group col-md-4" data-name="label">
-		<label class="control-label" data-name="label">{{translate 'label' category='fields' scope='EntityManager'}}</label>
-		<div class="field" data-name="label">
-			{{{label}}}
-		</div>
-	</div>
-</div>
-<div class="row">
-	<div class="cell form-group col-md-4" data-name="linkMultipleFieldForeign">
-		<label class="control-label" data-name="linkMultipleFieldForeign">{{translate 'linkMultipleField' category='fields' scope='EntityManager'}}</label>
-		<div class="field" data-name="linkMultipleFieldForeign">
-			{{{linkMultipleFieldForeign}}}
-		</div>
-	</div>
-	<div class="cell form-group col-md-4"></div>
-	<div class="cell form-group col-md-4" data-name="linkMultipleField">
-		<label class="control-label" data-name="linkMultipleField">{{translate 'linkMultipleField' category='fields' scope='EntityManager'}}</label>
-		<div class="field" data-name="linkMultipleField">
-			{{{linkMultipleField}}}
-		</div>
-	</div>
-</div>
-<div class="row">
-	<div class="cell form-group col-md-4" data-name="auditedForeign">
-		<label class="control-label" data-name="auditedForeign">{{translate 'audited' category='fields' scope='EntityManager'}}</label>
-		<div class="field" data-name="auditedForeign">
-			{{{auditedForeign}}}
-		</div>
-	</div>
-	<div class="cell form-group col-md-4"></div>
-	<div class="cell form-group col-md-4" data-name="audited">
-		<label class="control-label" data-name="audited">{{translate 'audited' category='fields' scope='EntityManager'}}</label>
-		<div class="field" data-name="audited">
-			{{{audited}}}
-		</div>
-	</div>
-</div>
-
-<div class="row">
-    <div class="cell form-group col-md-4" data-name="layoutForeign">
-        <label class="control-label" data-name="layoutForeign">{{translate 'layout' category='fields' scope='EntityManager'}}</label>
-        <div class="field" data-name="layoutForeign">
-            {{{layoutForeign}}}
-        </div>
-    </div>
-    <div class="cell form-group col-md-4"></div>
-    <div class="cell form-group col-md-4" data-name="layout">
-        <label class="control-label" data-name="layout">{{translate 'layout' category='fields' scope='EntityManager'}}</label>
-        <div class="field" data-name="layout">
-            {{{layout}}}
-        </div>
-    </div>
-</div>
-
-    <div class="row">
-        <div class="cell form-group col-md-4" data-name="selectFilterForeign">
-            <label class="control-label" data-name="selectFilterForeign">{{translate 'selectFilter' category='fields' scope='EntityManager'}}</label>
-            <div class="field" data-name="selectFilterForeign">
-                {{{selectFilterForeign}}}
+        <div class="row">
+            <div class="cell form-group col-md-4" data-name="entity">
+                <label class="control-label" data-name="entity">{{translate 'entity' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="entity">
+                    {{{entity}}}
+                </div>
+            </div>
+            <div class="cell form-group col-md-4" data-name="linkType">
+                <label class="control-label" data-name="linkType">{{translate 'linkType' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="linkType">
+                    {{{linkType}}}
+                </div>
+            </div>
+            <div class="cell form-group col-md-4" data-name="entityForeign">
+                <label class="control-label" data-name="entityForeign">{{translate 'entityForeign' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="entityForeign">
+                    {{{entityForeign}}}
+                </div>
             </div>
         </div>
-        <div class="cell form-group col-md-4"></div>
-        <div class="cell form-group col-md-4" data-name="selectFilter">
-            <label class="control-label" data-name="selectFilter">{{translate 'selectFilter' category='fields' scope='EntityManager'}}</label>
-            <div class="field" data-name="selectFilter">
-                {{{selectFilter}}}
+        <div class="row">
+            <div class="cell form-group col-md-4" data-name="linkForeign">
+                <label class="control-label" data-name="linkForeign">{{translate 'name' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="linkForeign">
+                    {{{linkForeign}}}
+                </div>
+            </div>
+            <div class="cell form-group col-md-4" data-name="relationName">
+                {{#if relationName}}
+                <label class="control-label" data-name="relationName">{{translate 'relationName' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="relationName">
+                    {{{relationName}}}
+                </div>
+                {{/if}}
+            </div>
+            <div class="cell form-group col-md-4" data-name="link">
+                <label class="control-label" data-name="link">{{translate 'name' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="link">
+                    {{{link}}}
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="cell form-group col-md-4" data-name="labelForeign">
+                <label class="control-label" data-name="labelForeign">{{translate 'label' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="labelForeign">
+                    {{{labelForeign}}}
+                </div>
+            </div>
+            <div class="cell form-group col-md-4"></div>
+            <div class="cell form-group col-md-4" data-name="label">
+                <label class="control-label" data-name="label">{{translate 'label' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="label">
+                    {{{label}}}
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="cell form-group col-md-4" data-name="linkMultipleFieldForeign">
+                <label class="control-label" data-name="linkMultipleFieldForeign">{{translate 'linkMultipleField' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="linkMultipleFieldForeign">
+                    {{{linkMultipleFieldForeign}}}
+                </div>
+            </div>
+            <div class="cell form-group col-md-4"></div>
+            <div class="cell form-group col-md-4" data-name="linkMultipleField">
+                <label class="control-label" data-name="linkMultipleField">{{translate 'linkMultipleField' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="linkMultipleField">
+                    {{{linkMultipleField}}}
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="cell form-group col-md-4" data-name="auditedForeign">
+                <label class="control-label" data-name="auditedForeign">{{translate 'audited' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="auditedForeign">
+                    {{{auditedForeign}}}
+                </div>
+            </div>
+            <div class="cell form-group col-md-4"></div>
+            <div class="cell form-group col-md-4" data-name="audited">
+                <label class="control-label" data-name="audited">{{translate 'audited' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="audited">
+                    {{{audited}}}
+                </div>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="cell form-group col-md-4" data-name="layoutForeign">
+                <label class="control-label" data-name="layoutForeign">{{translate 'layout' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="layoutForeign">
+                    {{{layoutForeign}}}
+                </div>
+            </div>
+            <div class="cell form-group col-md-4"></div>
+            <div class="cell form-group col-md-4" data-name="layout">
+                <label class="control-label" data-name="layout">{{translate 'layout' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="layout">
+                    {{{layout}}}
+                </div>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="cell form-group col-md-4" data-name="selectFilterForeign">
+                <label class="control-label" data-name="selectFilterForeign">{{translate 'selectFilter' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="selectFilterForeign">
+                    {{{selectFilterForeign}}}
+                </div>
+            </div>
+            <div class="cell form-group col-md-4"></div>
+            <div class="cell form-group col-md-4" data-name="selectFilter">
+                <label class="control-label" data-name="selectFilter">{{translate 'selectFilter' category='fields' scope='EntityManager'}}</label>
+                <div class="field" data-name="selectFilter">
+                    {{{selectFilter}}}
+                </div>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="cell form-group col-md-4"></div>
+            <div class="cell form-group col-md-4" data-name="parentEntityTypeList">
+                <label class="control-label" data-name="parentEntityTypeList">
+                    {{translate 'parentEntityTypeList' category='fields' scope='EntityManager'}}
+                </label>
+                <div class="field" data-name="parentEntityTypeList">
+                    {{{parentEntityTypeList}}}
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="cell form-group col-md-4"></div>
+            <div class="cell form-group col-md-4" data-name="foreignLinkEntityTypeList">
+                <label class="control-label" data-name="foreignLinkEntityTypeList">
+                    {{translate 'foreignLinkEntityTypeList' category='fields' scope='EntityManager'}}
+                </label>
+                <div class="field" data-name="foreignLinkEntityTypeList">
+                    {{{foreignLinkEntityTypeList}}}
+                </div>
             </div>
         </div>
     </div>
-
-<div class="row">
-	<div class="cell form-group col-md-4"></div>
-	<div class="cell form-group col-md-4" data-name="parentEntityTypeList">
-		<label class="control-label" data-name="parentEntityTypeList">
-			{{translate 'parentEntityTypeList' category='fields' scope='EntityManager'}}
-		</label>
-		<div class="field" data-name="parentEntityTypeList">
-			{{{parentEntityTypeList}}}
-		</div>
-	</div>
 </div>
-<div class="row">
-	<div class="cell form-group col-md-4"></div>
-	<div class="cell form-group col-md-4" data-name="foreignLinkEntityTypeList">
-		<label class="control-label" data-name="foreignLinkEntityTypeList">
-			{{translate 'foreignLinkEntityTypeList' category='fields' scope='EntityManager'}}
-		</label>
-		<div class="field" data-name="foreignLinkEntityTypeList">
-			{{{foreignLinkEntityTypeList}}}
-		</div>
-	</div>
-</div>
-
-</div></div>
diff --git a/client/src/views/admin/link-manager/modals/edit.js b/client/src/views/admin/link-manager/modals/edit.js
index 9d3911b8d8..a1570e2f36 100644
--- a/client/src/views/admin/link-manager/modals/edit.js
+++ b/client/src/views/admin/link-manager/modals/edit.js
@@ -159,6 +159,7 @@ class LinkManagerEditModalView extends ModalView {
             }
 
             this.model.set('linkType', linkType);
+            this.model.set('entity', this.scope);
             this.model.set('entityForeign', entityForeign);
             this.model.set('link', link);
             this.model.set('linkForeign', linkForeign);
@@ -235,12 +236,15 @@ class LinkManagerEditModalView extends ModalView {
 
         entityList.unshift('');
 
-        this.createView('entity', 'views/fields/varchar', {
+        this.createView('entity', 'views/fields/enum', {
             model: model,
             mode: 'edit',
             selector: '.field[data-name="entity"]',
-            defs: {
-                name: 'entity'
+            name: 'entity',
+            params: {
+                required: true,
+                options: entityList,
+                translation: 'Global.scopeNames',
             },
             readOnly: true,
         });
@@ -249,13 +253,11 @@ class LinkManagerEditModalView extends ModalView {
             model: model,
             mode: 'edit',
             selector: '.field[data-name="entityForeign"]',
-            defs: {
-                name: 'entityForeign',
-                params: {
-                    required: true,
-                    options: entityList,
-                    translation: 'Global.scopeNames',
-                }
+            name: 'entityForeign',
+            params: {
+                required: true,
+                options: entityList,
+                translation: 'Global.scopeNames',
             },
             readOnly: !isNew,
         });