diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 22b341ee4..e7674d272 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -69,6 +69,12 @@ public function __construct(
 					return '.' . $out;
 				},
 			],
+			'showCategoryInList' => [
+				'default' => true,
+				'validate' => function ($value) {
+					return filter_var($value, FILTER_VALIDATE_BOOLEAN);
+				},
+			],
 		];
 	}
 
diff --git a/src/components/AppSettings.vue b/src/components/AppSettings.vue
index 02930c487..e53df990f 100644
--- a/src/components/AppSettings.vue
+++ b/src/components/AppSettings.vue
@@ -34,6 +34,14 @@
 				</NcRadioGroupButton>
 			</NcRadioGroup>
 
+			<NcCheckboxRadioSwitch
+				:checked="settings.showCategoryInList !== false"
+				type="switch"
+				@update:checked="onChangeShowCategoryInList"
+			>
+				{{ t('notes', 'Show category names in the list of all notes') }}
+			</NcCheckboxRadioSwitch>
+
 			<NcRadioGroup
 				v-model="settings.fileSuffix"
 				:label="t('notes', 'File extension')"
@@ -91,6 +99,7 @@ import NcAppSettingsSection from '@nextcloud/vue/components/NcAppSettingsSection
 import NcAppSettingsShortcutsSection from '@nextcloud/vue/components/NcAppSettingsShortcutsSection'
 import NcHotkeyList from '@nextcloud/vue/components/NcHotkeyList'
 import NcHotkey from '@nextcloud/vue/components/NcHotkey'
+import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcRadioGroup from '@nextcloud/vue/components/NcRadioGroup'
 import NcRadioGroupButton from '@nextcloud/vue/components/NcRadioGroupButton'
 import NcFormBox from '@nextcloud/vue/components/NcFormBox'
@@ -112,6 +121,7 @@ export default {
 	name: 'AppSettings',
 
 	components: {
+		NcCheckboxRadioSwitch,
 		NcTextField,
 		NcAppSettingsDialog,
 		NcAppSettingsSection,
@@ -201,6 +211,11 @@ export default {
 			await filePicker.pick()
 
 		},
+		onChangeShowCategoryInList(checked) {
+			this.$set(this.settings, 'showCategoryInList', checked)
+			this.onChangeSettings()
+		},
+
 		onChangeSettings() {
 			this.saving = true
 			return setSettings(this.settings)
diff --git a/src/components/NotesView.vue b/src/components/NotesView.vue
index f9a93235b..bcbf96e95 100644
--- a/src/components/NotesView.vue
+++ b/src/components/NotesView.vue
@@ -26,7 +26,7 @@
 
 				<NotesList v-if="groupedNotes.length === 1"
 					:notes="groupedNotes[0].notes"
-					:show-category-title="category === null"
+					:show-category-title="showCategoryTitles"
 					@note-selected="onNoteSelected"
 				/>
 				<template v-for="(group, idx) in groupedNotes" v-else>
@@ -41,7 +41,7 @@
 					<NotesList
 						:key="idx"
 						:notes="group.notes"
-						:show-category-title="category === null"
+						:show-category-title="showCategoryTitles"
 						@note-selected="onNoteSelected"
 					/>
 				</template>
@@ -142,6 +142,10 @@ export default {
 			}
 		},
 
+		showCategoryTitles() {
+			return this.category === null && store.state.app.settings.showCategoryInList !== false
+		},
+
 		// group notes by time ("All notes") or by category (if category chosen)
 		groupedNotes() {
 			if (this.category === null) {