diff --git a/src/app/components/settings/settings.component.html b/src/app/components/settings/settings.component.html
index c17358f9e..1e2a554ed 100644
--- a/src/app/components/settings/settings.component.html
+++ b/src/app/components/settings/settings.component.html
@@ -59,10 +59,19 @@
                 {{ 'APP.SETTINGS.EXPERIMENTAL-FEATURES' | translate }}
             </mat-panel-title>
         </mat-expansion-panel-header>
-        <mat-checkbox
-            [(ngModel)]="libraries"
-            (change)="onChangeLibrariesFeature($event)">
-            Library Management
-        </mat-checkbox>
+        <div>
+            <mat-checkbox
+                [(ngModel)]="libraries"
+                (change)="onChangeLibrariesFeature($event)">
+                Library Management
+            </mat-checkbox>
+        </div>
+        <div>
+            <mat-checkbox
+                [(ngModel)]="comments"
+                (change)="onChangeCommentsFeature($event)">
+                Comments
+            </mat-checkbox>
+        </div>
     </mat-expansion-panel>
 </mat-accordion>
diff --git a/src/app/components/settings/settings.component.ts b/src/app/components/settings/settings.component.ts
index e2ff08280..ae4de7c52 100644
--- a/src/app/components/settings/settings.component.ts
+++ b/src/app/components/settings/settings.component.ts
@@ -49,6 +49,7 @@ export class SettingsComponent implements OnInit {
     headerColor$: Observable<string>;
     languagePicker$: Observable<boolean>;
     libraries: boolean;
+    comments: boolean;
 
     constructor(
         private store: Store<AppStore>,
@@ -74,6 +75,9 @@ export class SettingsComponent implements OnInit {
 
         const libraries = this.appConfig.get('experimental.libraries');
         this.libraries = (libraries === true || libraries === 'true');
+
+        const comments = this.appConfig.get('experimental.comments');
+        this.comments = (comments === true || comments === 'true');
     }
 
     apply(model: any, isValid: boolean) {
@@ -97,4 +101,8 @@ export class SettingsComponent implements OnInit {
     onChangeLibrariesFeature(event: MatCheckboxChange) {
         this.storage.setItem('experimental.libraries', event.checked.toString());
     }
+
+    onChangeCommentsFeature(event: MatCheckboxChange) {
+        this.storage.setItem('experimental.comments', event.checked.toString());
+    }
 }