diff --git a/lib/editors/markdown_editor.dart b/lib/editors/markdown_editor.dart
index d35b5da0..7f78aa3d 100644
--- a/lib/editors/markdown_editor.dart
+++ b/lib/editors/markdown_editor.dart
@@ -104,7 +104,7 @@ class MarkdownEditorState extends State<MarkdownEditor>
         children: <Widget>[
           NoteTitleEditor(
             _titleTextController,
-            _noteTextChanged,
+            _noteTitleTextChanged,
           ),
           NoteBodyEditor(
             textController: _textController,
@@ -176,6 +176,20 @@ class MarkdownEditorState extends State<MarkdownEditor>
     notifyListeners();
   }
 
+  void _noteTitleTextChanged() {
+    if (_noteModified && !widget.editMode) return;
+
+    var newState =
+        !(widget.editMode && _titleTextController.text.trim().isEmpty);
+    if (newState != _noteModified) {
+      setState(() {
+        _noteModified = newState;
+      });
+    }
+
+    notifyListeners();
+  }
+
   void _applyHeuristics() {
     var selection = _textController.selection;
     if (selection.baseOffset != selection.extentOffset) {