diff --git a/src/public/javascripts/widgets/note_tree.js b/src/public/javascripts/widgets/note_tree.js
index d304fcc5a..75ced6fae 100644
--- a/src/public/javascripts/widgets/note_tree.js
+++ b/src/public/javascripts/widgets/note_tree.js
@@ -831,11 +831,4 @@ export default class NoteTreeWidget extends TabAwareWidget {
 
         noteCreateService.duplicateNote(noteId, branch.parentNoteId);
     }
-
-    async tabNoteSwitchedEvent({tabContext, notePath}) {
-        // this causes unnecessary scrolling to active note
-        if (tabContext.isActive()) {
-            super.tabNoteSwitchedEvent({tabContext, notePath});
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/public/javascripts/widgets/tab_aware_widget.js b/src/public/javascripts/widgets/tab_aware_widget.js
index cf2375293..15a52e9be 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.notePath === notePath) {
+        if (tabContext.isActive() && tabContext.notePath === notePath) {
             await this.noteSwitched();
         }
     }