diff --git a/src/public/javascripts/widgets/note_tree.js b/src/public/javascripts/widgets/note_tree.js
index 75ced6fae..513856712 100644
--- a/src/public/javascripts/widgets/note_tree.js
+++ b/src/public/javascripts/widgets/note_tree.js
@@ -418,7 +418,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
         await this.tree.reload(notes);
     }
 
-    collapseTreeCommand() { this.collapseTree(); }
+    // must be event since it's triggered from outside the tree
+    collapseTreeEvent() { this.collapseTree(); }
 
     isEnabled() {
         return !!this.tabContext;
diff --git a/src/public/javascripts/widgets/tab_aware_widget.js b/src/public/javascripts/widgets/tab_aware_widget.js
index 15a52e9be..cf2375293 100644
--- a/src/public/javascripts/widgets/tab_aware_widget.js
+++ b/src/public/javascripts/widgets/tab_aware_widget.js
@@ -48,7 +48,7 @@ export default class TabAwareWidget extends BasicWidget {
 
     async tabNoteSwitchedEvent({tabContext, notePath}) {
         // if notePath does not match then the tabContext has been switched to another note in the mean time
-        if (tabContext.isActive() && tabContext.notePath === notePath) {
+        if (tabContext.notePath === notePath) {
             await this.noteSwitched();
         }
     }