diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.html b/src/Squidex/app/features/content/pages/content/content-field.component.html
index 8961b2707..f7498ead3 100644
--- a/src/Squidex/app/features/content/pages/content/content-field.component.html
+++ b/src/Squidex/app/features/content/pages/content/content-field.component.html
@@ -51,7 +51,7 @@
                     <input class="form-control" type="text" [formControl]="selectedFormControl" [placeholder]="field.displayPlaceholder" sqxSlugifyInput />
                 </div>
                 <div *ngSwitchCase="'TextArea'">
-                    <textarea class="form-control"  [id]="selectedFormName"[formControl]="selectedFormControl" rows="5" [placeholder]="field.displayPlaceholder"></textarea>
+                    <textarea class="form-control" [formControl]="selectedFormControl" rows="5" [placeholder]="field.displayPlaceholder"></textarea>
                 </div>
                 <div *ngSwitchCase="'RichText'">
                     <sqx-rich-editor [formControl]="selectedFormControl"></sqx-rich-editor>
@@ -103,7 +103,12 @@
             <sqx-tag-editor [formControl]="selectedFormControl"></sqx-tag-editor>
         </div>
         <div *ngSwitchCase="'References'">
-            <sqx-references-editor [formControl]="selectedFormControl" [language]="selectedLanguage" [schemaId]="field.properties.schemaId"></sqx-references-editor>
+            <sqx-references-editor
+                [formControl]="selectedFormControl" 
+                [language]="language"
+                [languages]="languages"
+                [schemaId]="field.properties.schemaId">
+            </sqx-references-editor>
         </div>
     </div>
 
diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.ts b/src/Squidex/app/features/content/pages/content/content-field.component.ts
index 05ada0806..ce19bb79a 100644
--- a/src/Squidex/app/features/content/pages/content/content-field.component.ts
+++ b/src/Squidex/app/features/content/pages/content/content-field.component.ts
@@ -26,6 +26,9 @@ export class ContentFieldComponent implements OnInit {
     @Input()
     public fieldForm: FormGroup;
 
+    @Input()
+    public language: AppLanguageDto;
+
     @Input()
     public languages: AppLanguageDto[];
 
@@ -33,25 +36,24 @@ export class ContentFieldComponent implements OnInit {
     public contentFormSubmitted: boolean;
 
     public selectedFormControl: AbstractControl;
-    public selectedLanguage: AppLanguageDto;
 
     public ngOnInit() {
-        const masterLanguage = this.languages[0];
+        if (!this.language) {
+            this.language = this.languages[0];
+        }
 
         if (this.field.isLocalizable) {
-            this.selectedFormControl = this.fieldForm.controls[masterLanguage.iso2Code];
+            this.selectedFormControl = this.fieldForm.controls[this.language.iso2Code];
         } else {
             this.selectedFormControl = this.fieldForm.controls[fieldInvariant];
         }
-
-        this.selectedLanguage = masterLanguage;
     }
 
     public selectLanguage(language: AppLanguageDto) {
         this.selectedFormControl['_clearChangeFns']();
-
         this.selectedFormControl = this.fieldForm.controls[language.iso2Code];
-        this.selectedLanguage = language;
+
+        this.language = language;
     }
 }
 
diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.html b/src/Squidex/app/features/content/shared/contents-selector.component.html
index 9c2b1282b..a7511a5bf 100644
--- a/src/Squidex/app/features/content/shared/contents-selector.component.html
+++ b/src/Squidex/app/features/content/shared/contents-selector.component.html
@@ -10,6 +10,10 @@
             </button>
             
             <sqx-search-form (queryChanged)="search($event)" [canArchive]="false"></sqx-search-form>
+
+            <ng-container *ngIf="languages.length > 1">
+                <sqx-language-selector class="languages-buttons" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages"></sqx-language-selector>
+            </ng-container>
         </div>
     </ng-container>
 
@@ -43,7 +47,7 @@
                             <tr [sqxContent]="content"
                                 [selected]="isItemSelected(content)"
                                 (selectedChange)="onContentSelected(content)"
-                                [language]="languageSelected"
+                                [language]="language"
                                 [schema]="schema" 
                                 isReadOnly="true"></tr>
                             <tr class="spacer"></tr>
diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.ts b/src/Squidex/app/features/content/shared/contents-selector.component.ts
index e10511fbd..b89598f8d 100644
--- a/src/Squidex/app/features/content/shared/contents-selector.component.ts
+++ b/src/Squidex/app/features/content/shared/contents-selector.component.ts
@@ -26,7 +26,10 @@ import {
 })
 export class ContentsSelectorComponent implements OnInit {
     @Input()
-    public language: LanguageDto[];
+    public language: LanguageDto;
+
+    @Input()
+    public languages: LanguageDto[];
 
     @Input()
     public schema: SchemaDetailsDto;
@@ -102,6 +105,10 @@ export class ContentsSelectorComponent implements OnInit {
         return this.selectedItems[content.id];
     }
 
+    public selectLanguage(language: LanguageDto) {
+        this.language = language;
+    }
+
     public complete() {
         this.selected.emit([]);
     }
diff --git a/src/Squidex/app/features/content/shared/references-editor.component.html b/src/Squidex/app/features/content/shared/references-editor.component.html
index a2ad6ff77..d269f0cdb 100644
--- a/src/Squidex/app/features/content/shared/references-editor.component.html
+++ b/src/Squidex/app/features/content/shared/references-editor.component.html
@@ -25,7 +25,10 @@
 </div>
 
 <ng-container *sqxModalView="isModalVisibible;onRoot:true;closeAuto:false">
-    <sqx-contents-selector [language]="language" [schema]="schema"
+    <sqx-contents-selector 
+        [language]="language"
+        [languages]="languages"
+        [schema]="schema"
         (selected)="onContentsSelected($event)">
     </sqx-contents-selector>
 </ng-container>
\ No newline at end of file
diff --git a/src/Squidex/app/features/content/shared/references-editor.component.ts b/src/Squidex/app/features/content/shared/references-editor.component.ts
index 62fcc7dea..0f99d5a4b 100644
--- a/src/Squidex/app/features/content/shared/references-editor.component.ts
+++ b/src/Squidex/app/features/content/shared/references-editor.component.ts
@@ -44,6 +44,9 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit {
     @Input()
     public language: AppLanguageDto;
 
+    @Input()
+    public languages: AppLanguageDto[];
+
     public isModalVisibible = false;
 
     public schema: SchemaDetailsDto;
diff --git a/src/Squidex/app/framework/angular/modals/modal-dialog.component.html b/src/Squidex/app/framework/angular/modals/modal-dialog.component.html
index 27ecab1b6..040beb332 100644
--- a/src/Squidex/app/framework/angular/modals/modal-dialog.component.html
+++ b/src/Squidex/app/framework/angular/modals/modal-dialog.component.html
@@ -28,4 +28,6 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<sqx-shortcut keys="escape" (trigger)="closed.emit()"></sqx-shortcut>
\ No newline at end of file