diff --git a/package-lock.json b/package-lock.json
index e83b6e176..75d848660 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9567,6 +9567,11 @@
 			"resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.6.tgz",
 			"integrity": "sha512-s7jmZPlm9FeueJg1RwJtnE9KNPtME/7C8uRWSfp9/yEN4M8XcS/d+bddoyVwVnvFyRh9msFo0HWeW0vTL8Qv+w=="
 		},
+		"vue-observe-visibility": {
+			"version": "0.4.6",
+			"resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",
+			"integrity": "sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q=="
+		},
 		"vue-resize": {
 			"version": "0.4.5",
 			"resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.5.tgz",
diff --git a/package.json b/package.json
index 5745d0914..8958bedc1 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
 		"easymde": "^2.8.0",
 		"markdown-it": "^10.0.0",
 		"vue": "^2.6.11",
+		"vue-observe-visibility": "^0.4.6",
 		"vue-router": "^3.1.3",
 		"vuex": "^3.1.2"
 	},
diff --git a/src/components/NavigationList.vue b/src/components/NavigationList.vue
index 44953776d..a9c4ec794 100644
--- a/src/components/NavigationList.vue
+++ b/src/components/NavigationList.vue
@@ -45,27 +45,41 @@
 				@note-deleted="$emit('note-deleted')"
 			/>
 		</template>
+		<AppNavigationItem
+			v-if="notes.length != filteredNotes.length"
+			v-observe-visibility="onEndOfNotes"
+			:title="t('notes', 'Loading …')"
+			:loading="true"
+		/>
 	</ul>
 </template>
 
 <script>
 import {
 	AppNavigationCaption,
+	AppNavigationItem,
 } from '@nextcloud/vue'
 import NavigationCategoriesItem from './NavigationCategoriesItem'
 import NavigationNoteItem from './NavigationNoteItem'
 import NotesService from '../NotesService'
 import store from '../store'
 
+import { ObserveVisibility } from 'vue-observe-visibility'
+
 export default {
 	name: 'NavigationList',
 
 	components: {
 		AppNavigationCaption,
+		AppNavigationItem,
 		NavigationCategoriesItem,
 		NavigationNoteItem,
 	},
 
+	directives: {
+		'observe-visibility': ObserveVisibility,
+	},
+
 	props: {
 		filteredNotes: {
 			type: Array,
@@ -86,6 +100,7 @@ export default {
 			timeslots: [],
 			monthFormat: new Intl.DateTimeFormat(OC.getLanguage(), { month: 'long', year: 'numeric' }),
 			lastYear: new Date(new Date().getFullYear() - 1, 0),
+			showFirstNotesOnly: true,
 		}
 	},
 
@@ -94,10 +109,18 @@ export default {
 			return store.getters.numNotes()
 		},
 
+		notes() {
+			if (this.filteredNotes.length > 40 && this.showFirstNotesOnly) {
+				return this.filteredNotes.slice(0, 30)
+			} else {
+				return this.filteredNotes
+			}
+		},
+
 		// group notes by time ("All notes") or by category (if category chosen)
 		groupedNotes() {
 			if (this.category === null) {
-				return this.filteredNotes.reduce((g, note) => {
+				return this.notes.reduce((g, note) => {
 					const timeslot = this.getTimeslotFromNote(note)
 					if (g.length === 0 || g[g.length - 1].timeslot !== timeslot) {
 						g.push({ timeslot: timeslot, notes: [] })
@@ -106,7 +129,7 @@ export default {
 					return g
 				}, [])
 			} else {
-				return this.filteredNotes.reduce((g, note) => {
+				return this.notes.reduce((g, note) => {
 					if (g.length === 0 || g[g.length - 1].category !== note.category) {
 						g.push({ category: note.category, notes: [] })
 					}
@@ -129,6 +152,10 @@ export default {
 		},
 	},
 
+	watch: {
+		category: function() { this.showFirstNotesOnly = true },
+	},
+
 	created() {
 		this.updateTimeslots()
 		setInterval(this.updateTimeslots, 1000 * 60)
@@ -170,6 +197,12 @@ export default {
 				return new Date(t).getFullYear().toString()
 			}
 		},
+
+		onEndOfNotes(isVisible) {
+			if (isVisible) {
+				this.showFirstNotesOnly = false
+			}
+		},
 	},
 }
 </script>