From 02dd7f17c03c968528f8444f438b8649aab02274 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com>
Date: Tue, 13 Oct 2020 15:54:10 -0400
Subject: [PATCH] Add extra note focus safety check

---
 modules/ui/note_editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();
         }