diff --git a/src/components/NoteItem.vue b/src/components/NoteItem.vue
index b65642d60..e3d2ea5a3 100644
--- a/src/components/NoteItem.vue
+++ b/src/components/NoteItem.vue
@@ -14,7 +14,7 @@
 		@click="onNoteSelected(note.id)"
 		@dragstart.native="onDragStart"
 	>
-		<template #subtitle>
+		<template v-if="showCategoryTitle" #subname>
 			{{ categoryTitle }}
 		</template>
 		<template #icon>
@@ -132,6 +132,10 @@ export default {
 			type: Object,
 			required: true,
 		},
+		showCategoryTitle: {
+			type: Boolean,
+			default: false,
+		},
 	},
 
 	data() {
diff --git a/src/components/NotesList.vue b/src/components/NotesList.vue
index 54533bd07..364ebaa1b 100644
--- a/src/components/NotesList.vue
+++ b/src/components/NotesList.vue
@@ -6,9 +6,10 @@
 <template>
 	<ul>
 		<NoteItem v-for="note in notes"
-			:key="note.id"
+			:key="`${note.id}-${showCategoryTitle ? 'with-category-title' : 'without-category-title'}`"
 			:note="note"
 			:renaming="isRenaming(note.id)"
+			:show-category-title="showCategoryTitle"
 			@note-selected="onNoteSelected"
 			@start-renaming="onStartRenaming"
 		/>
@@ -30,6 +31,10 @@ export default {
 			type: Array,
 			required: true,
 		},
+		showCategoryTitle: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {
diff --git a/src/components/NotesView.vue b/src/components/NotesView.vue
index df28ff2dd..f9a93235b 100644
--- a/src/components/NotesView.vue
+++ b/src/components/NotesView.vue
@@ -26,6 +26,7 @@
 
 				<NotesList v-if="groupedNotes.length === 1"
 					:notes="groupedNotes[0].notes"
+					:show-category-title="category === null"
 					@note-selected="onNoteSelected"
 				/>
 				<template v-for="(group, idx) in groupedNotes" v-else>
@@ -40,6 +41,7 @@
 					<NotesList
 						:key="idx"
 						:notes="group.notes"
+						:show-category-title="category === null"
 						@note-selected="onNoteSelected"
 					/>
 				</template>