diff --git a/src/public/app/widgets/component.js b/src/public/app/widgets/component.js
index c255a3eb9..ac1b8e0ad 100644
--- a/src/public/app/widgets/component.js
+++ b/src/public/app/widgets/component.js
@@ -92,7 +92,7 @@ export default class Component {
         }
 
         if (glob.isDev) {
-            await utils.timeLimit(promise, 3000, `Time limit failed on ${this.constructor.name} with ${fun.name}`);
+            await utils.timeLimit(promise, 20000, `Time limit failed on ${this.constructor.name} with ${fun.name}`);
         }
         else {
             // cheaper and in non-dev the extra reporting is lost anyway through reload
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 37d7c5b8b..75e34d904 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -1030,6 +1030,9 @@ export default class NoteTreeWidget extends TabAwareWidget {
         }
 
         for (const branch of loadResults.getBranches()) {
+            // adding noteId itself to update all potential clones
+            noteIdsToUpdate.add(branch.noteId);
+
             for (const node of this.getNodesByBranchId(branch.branchId)) {
                 if (branch.isDeleted) {
                     if (node.isActive()) {
@@ -1048,9 +1051,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
 
                     noteIdsToUpdate.add(branch.parentNoteId);
                 }
-                else {
-                    noteIdsToUpdate.add(branch.noteId);
-                }
             }
 
             if (!branch.isDeleted) {