diff --git a/src/public/javascripts/services/attributes.js b/src/public/javascripts/services/attributes.js
index b58b94835..2f0337e0a 100644
--- a/src/public/javascripts/services/attributes.js
+++ b/src/public/javascripts/services/attributes.js
@@ -160,7 +160,7 @@ async function createPromotedAttributeRow(definitionAttr, valueAttr) {
                 $input.autocomplete({
                     appendTo: document.querySelector('body'),
                     hint: false,
-                    autoselect: true,
+                    autoselect: false,
                     openOnFocus: true,
                     minLength: 0,
                     tabAutocomplete: false
diff --git a/src/services/tree.js b/src/services/tree.js
index 6e97ed065..9d2a41488 100644
--- a/src/services/tree.js
+++ b/src/services/tree.js
@@ -113,8 +113,8 @@ async function sortNotesAlphabetically(parentNoteId) {
 async function setNoteToParent(noteId, prefix, parentNoteId) {
     const parentNote = await repository.getNote(parentNoteId);
 
-    if (parentNote.isDeleted) {
-        throw new Error("Cannot move note to deleted parent note");
+    if (parentNote && parentNote.isDeleted) {
+        throw new Error(`Cannot move note to deleted parent note ${parentNoteId}`);
     }
 
     // case where there might be more such branches is ignored. It's expected there should be just one