diff --git a/src/public/javascripts/widgets/note_detail.js b/src/public/javascripts/widgets/note_detail.js
index b85508482..717612d63 100644
--- a/src/public/javascripts/widgets/note_detail.js
+++ b/src/public/javascripts/widgets/note_detail.js
@@ -111,6 +111,12 @@ export default class NoteDetailWidget extends TabAwareWidget {
 
             await typeWidget.handleEvent('setTabContext', {tabContext: this.tabContext});
 
+            // this is happening in update() so note has been already set and we need to reflect this
+            await typeWidget.handleEvent('tabNoteSwitched', {
+                tabContext: this.tabContext,
+                notePath: this.tabContext.notePath
+            });
+
             this.child(typeWidget);
         }
 
diff --git a/src/public/javascripts/widgets/tab_aware_widget.js b/src/public/javascripts/widgets/tab_aware_widget.js
index d0feaf647..cf2375293 100644
--- a/src/public/javascripts/widgets/tab_aware_widget.js
+++ b/src/public/javascripts/widgets/tab_aware_widget.js
@@ -80,8 +80,6 @@ export default class TabAwareWidget extends BasicWidget {
     setTabContextEvent({tabContext}) {
         /** @var {TabContext} */
         this.tabContext = tabContext;
-
-        this.refresh();
     }
 
     async noteTypeMimeChangedEvent({noteId}) {