diff --git a/src/public/app/services/note_list_renderer.js b/src/public/app/services/note_list_renderer.js
index ba23260c1..864b1a539 100644
--- a/src/public/app/services/note_list_renderer.js
+++ b/src/public/app/services/note_list_renderer.js
@@ -155,8 +155,8 @@ class NoteListRenderer {
         this.page = 1;
         this.pageSize = parseInt(parentNote.getLabelValue('pageSize'));
 
-        if (!this.pageSize || this.pageSize < 1 || this.pageSize > 10000) {
-            this.pageSize = 10;
+        if (!this.pageSize || this.pageSize < 1) {
+            this.pageSize = 20;
         }
 
         this.viewType = parentNote.getLabelValue('viewType');
diff --git a/src/public/app/services/tree_cache.js b/src/public/app/services/tree_cache.js
index 4d5fda4cd..d68b9d17e 100644
--- a/src/public/app/services/tree_cache.js
+++ b/src/public/app/services/tree_cache.js
@@ -262,6 +262,10 @@ class TreeCache {
     }
 
     getNoteFromCache(noteId) {
+        if (!noteId) {
+            throw new Error("Empty noteId");
+        }
+
         return this.notes[noteId];
     }
 
diff --git a/src/public/app/widgets/note_list.js b/src/public/app/widgets/note_list.js
index c821ab190..65fc80694 100644
--- a/src/public/app/widgets/note_list.js
+++ b/src/public/app/widgets/note_list.js
@@ -9,7 +9,7 @@ const TPL = `
         flex-grow: 100000;
         flex-shrink: 100000;
         min-height: 0;
-        padding: 0 10px 10px 10px;
+        overflow: auto;
     }
     </style>