diff --git a/packages/core/collections/notes.js b/packages/core/collections/notes.js
index 679fb3971..e75085f43 100644
--- a/packages/core/collections/notes.js
+++ b/packages/core/collections/notes.js
@@ -282,7 +282,7 @@ function isNoteEmpty(note, content) {
 
 function getNoteHeadline(note, content) {
   if (note.locked) return "";
-  return content.toHeadline();
+  return note.headline || content.toHeadline();
 }
 
 function getNoteTitle(note, content) {