diff --git a/demo-shell/src/app/components/config-editor/config-editor.component.html b/demo-shell/src/app/components/config-editor/config-editor.component.html
index 031edf0671..cffed65c68 100644
--- a/demo-shell/src/app/components/config-editor/config-editor.component.html
+++ b/demo-shell/src/app/components/config-editor/config-editor.component.html
@@ -69,6 +69,13 @@
                 <mat-icon>info</mat-icon>	
             </button>	
         </mat-list-item>
+
+        <mat-list-item (click)="infinitePaginationConfClick()">	
+            <a matLine id="adf-infinite-pagination-conf">Infinite pagination</a>	
+            <button mat-icon-button>	
+                <mat-icon>info</mat-icon>	
+            </button>	
+        </mat-list-item>
     </mat-nav-list>
 
     <div>
diff --git a/demo-shell/src/app/components/config-editor/config-editor.component.ts b/demo-shell/src/app/components/config-editor/config-editor.component.ts
index 0e3ca21bae..fca0f509a4 100644
--- a/demo-shell/src/app/components/config-editor/config-editor.component.ts
+++ b/demo-shell/src/app/components/config-editor/config-editor.component.ts
@@ -16,7 +16,7 @@
  */
 
 import { Component } from '@angular/core';
-import { AppConfigService, NotificationService } from '@alfresco/adf-core';
+import { AppConfigService, NotificationService, UserPreferencesService, UserPreferenceValues } from '@alfresco/adf-core';
 
 @Component({
     selector: 'app-config-editor',
@@ -29,6 +29,8 @@ export class ConfigEditorComponent {
     code: any;
     field = 'content-metadata';
     invalidJson = false;
+    isUserPreference = false;
+    userPreferenceProperty: string;
 
     editorOptions = {
         theme: 'vs-dark',
@@ -43,13 +45,19 @@ export class ConfigEditorComponent {
         this.indentCode();
     }
 
-    constructor(private appConfig: AppConfigService, private notificationService: NotificationService) {
+    constructor(private appConfig: AppConfigService,
+                private userPreferencesService: UserPreferencesService,
+                private notificationService: NotificationService) {
         this.code = JSON.stringify(appConfig.config['content-metadata']);
     }
 
     onSave() {
         try {
-            this.appConfig.config[this.field] = JSON.parse(this.editor.getValue());
+            if (this.isUserPreference) {
+                this.userPreferencesService.set(this.userPreferenceProperty, JSON.parse(this.editor.getValue()));
+            } else {
+                this.appConfig.config[this.field] = JSON.parse(this.editor.getValue());
+            }
         } catch (error) {
             this.invalidJson = true;
             this.notificationService.openSnackMessage(
@@ -71,65 +79,85 @@ export class ConfigEditorComponent {
     }
 
     fileConfClick() {
+        this.isUserPreference = false;
         this.code = JSON.stringify(this.appConfig.config['files']);
         this.field = 'files';
         this.indentCode();
     }
 
     searchConfClick() {
+        this.isUserPreference = false;
         this.code = JSON.stringify(this.appConfig.config['search']);
         this.field = 'search';
         this.indentCode();
     }
 
     metadataConfClick() {
+        this.isUserPreference = false;
         this.code = JSON.stringify(this.appConfig.config['content-metadata']);
         this.field = 'content-metadata';
         this.indentCode();
     }
 
     taskHeaderConfClick() {
+        this.isUserPreference = false;
         this.code = JSON.stringify(this.appConfig.config['adf-task-header']);
         this.field = 'adf-task-header';
         this.indentCode();
     }
 
     processInstanceHeaderConfClick() {
+        this.isUserPreference = false;
         this.code = JSON.stringify(this.appConfig.config['adf-process-instance-header']);
         this.field = 'adf-process-instance-header';
         this.indentCode();
     }
 
     startProcessConfClick() {
+        this.isUserPreference = false;
         this.code = JSON.stringify(this.appConfig.config['adf-start-process']);
         this.field = 'adf-start-process';
         this.indentCode();
     }
 
     taskListCloudConfClick() {
+        this.isUserPreference = false;
         this.code = JSON.stringify(this.appConfig.config['adf-cloud-task-list']);
         this.field = 'adf-cloud-task-list';
         this.indentCode();
     }
 
     editProcessFilterConfClick() {
+        this.isUserPreference = false;
         this.code = JSON.stringify(this.appConfig.config['adf-edit-process-filter']);
         this.field = 'adf-edit-process-filter';
         this.indentCode();
     }
 
      editTaskFilterConfClick() {
+        this.isUserPreference = false;
         this.code = JSON.stringify(this.appConfig.config['adf-edit-task-filter']);
         this.field = 'adf-edit-task-filter';
         this.indentCode();
     }
 
     processListCloudConfClick() {
+        this.isUserPreference = false;
         this.code = JSON.stringify(this.appConfig.config['adf-cloud-process-list']);
         this.field = 'adf-cloud-process-list';
         this.indentCode();
     }
 
+    infinitePaginationConfClick() {
+        this.isUserPreference = true;
+        this.userPreferenceProperty = UserPreferenceValues.PaginationSize;
+        this.userPreferencesService.select(this.userPreferenceProperty).subscribe((pageSize: number) => {
+            this.code = JSON.stringify(pageSize);
+            this.field = 'adf-infinite-pagination';
+            this.indentCode();
+        });
+    }
+
     indentCode() {
         setTimeout(() => {
             this.editor.getAction('editor.action.formatDocument').run();
diff --git a/lib/core/pagination/infinite-pagination.component.ts b/lib/core/pagination/infinite-pagination.component.ts
index 86194ad29a..85b6bb4df3 100644
--- a/lib/core/pagination/infinite-pagination.component.ts
+++ b/lib/core/pagination/infinite-pagination.component.ts
@@ -92,7 +92,8 @@ export class InfinitePaginationComponent implements OnInit, OnDestroy, Paginatio
 
     private paginationSubscription: Subscription;
 
-    constructor(private cdr: ChangeDetectorRef, private userPreferencesService: UserPreferencesService) {
+    constructor(private cdr: ChangeDetectorRef,
+                private userPreferencesService: UserPreferencesService) {
     }
 
     ngOnInit() {