diff --git a/modules/ui/notes-editor.js b/modules/ui/notes-editor.js
index 011a325c..07376acc 100644
--- a/modules/ui/notes-editor.js
+++ b/modules/ui/notes-editor.js
@@ -6,7 +6,7 @@ function editNotes(id, name) {
   for (const note of notes) {select.options.add(new Option(note.id, note.id));}
 
   // select an object
-  if (notes.length) {
+  if (notes.length || id) {
     if (!id) id = notes[0].id;
     let note = notes.find(note => note.id === id);
     if (note === undefined) {
@@ -19,10 +19,9 @@ function editNotes(id, name) {
     notesName.value = note.name;
     notesText.value = note.legend;
   } else {
-    if (!notes.length) {
-      const value = "There are no added notes. Click on element (e.g. label) and add a free text note";
-      document.getElementById("notesText").value = value;
-    }
+    const value = "There are no added notes. Click on element (e.g. label) and add a free text note";
+    document.getElementById("notesText").value = value;
+    document.getElementById("notesName").value = "";
   }
 
   // open a dialog
@@ -54,12 +53,14 @@ function editNotes(id, name) {
   function changeName() {
     const id = document.getElementById("notesSelect").value;
     const note = notes.find(note => note.id === id);
+    if (!note) return;
     note.name = this.value;
   }
 
   function changeText() {
     const id = document.getElementById("notesSelect").value;
     const note = notes.find(note => note.id === id);
+    if (!note) return;
     note.legend = this.value;
   }