diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html
index b9d732343..352865e80 100644
--- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html
+++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html
@@ -8,7 +8,9 @@
                     <input class="form-control" [formControl]="contentsFilter" placeholder="Search for content" />
                 </form>
                 
-                <sqx-language-selector class="languages-buttons" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages"></sqx-language-selector>
+                <span *ngIf="languages.length > 1">
+                    <sqx-language-selector class="languages-buttons" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages"></sqx-language-selector>
+                </span>
 
                 <button class="btn btn-success" [routerLink]="['new']">
                     <i class="icon-plus"></i> New
diff --git a/src/Squidex/app/framework/angular/markdown-editor.component.ts b/src/Squidex/app/framework/angular/markdown-editor.component.ts
index 3bbbe4184..addf4be06 100644
--- a/src/Squidex/app/framework/angular/markdown-editor.component.ts
+++ b/src/Squidex/app/framework/angular/markdown-editor.component.ts
@@ -61,7 +61,7 @@ export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewI
         this.isDisabled = isDisabled;
 
         if (this.simplemde) {
-            this.simplemde.setOption('readOnly', isDisabled);
+            this.simplemde.codemirror.setOption('readOnly', isDisabled);
         }
     }
 
@@ -78,12 +78,16 @@ export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewI
             this.simplemde = new SimpleMDE({ element: this.editor.nativeElement });
             this.simplemde.value(this.value || '');
 
-            this.simplemde.codemirror.on('blur', () => {
+            this.simplemde.codemirror.on('change', () => {
                 const value = this.simplemde.value();
 
                 this.changeCallback(value);
             });
 
+            this.simplemde.codemirror.on('blur', () => {
+                this.touchedCallback();
+            });
+
             this.simplemde.codemirror.on('refresh', () => {
                 this.isFullscreen = this.simplemde.isFullscreenActive();
 
diff --git a/src/Squidex/app/framework/angular/rich-editor.component.ts b/src/Squidex/app/framework/angular/rich-editor.component.ts
index 9fcf7e9f6..62f21fe73 100644
--- a/src/Squidex/app/framework/angular/rich-editor.component.ts
+++ b/src/Squidex/app/framework/angular/rich-editor.component.ts
@@ -72,12 +72,16 @@ export class RichEditorComponent implements ControlValueAccessor, AfterViewInit,
                 setup: (editor: any) => {
                     self.tinyEditor = editor;
 
-                    self.tinyEditor.on('blur', () => {
+                    self.tinyEditor.on('change', () => {
                         const value = editor.getContent();
 
                         self.changeCallback(value);
                     });
 
+                    self.tinyEditor.on('blur', () => {
+                        self.touchedCallback();
+                    });
+
                     setTimeout(() => {
                         self.tinyEditor.setContent(this.value || '');
                     }, 500);