diff --git a/modules/ui/note_editor.js b/modules/ui/note_editor.js
index b63e0f82e..6c56c72d5 100644
--- a/modules/ui/note_editor.js
+++ b/modules/ui/note_editor.js
@@ -162,7 +162,7 @@ export function uiNoteEditor(context) {
             .on('input.note-input', changeInput)
             .on('blur.note-input', changeInput);
 
-        if (_newNote) {
+        if (!commentTextarea.empty() && _newNote) {
             // autofocus the comment field for new notes
             commentTextarea.node().focus();
         }