diff --git a/src/public/javascripts/widgets/attributes.js b/src/public/javascripts/widgets/attributes.js
index cab4d6ad0..fad0351a0 100644
--- a/src/public/javascripts/widgets/attributes.js
+++ b/src/public/javascripts/widgets/attributes.js
@@ -88,6 +88,12 @@ class AttributesWidget extends StandardWidget {
         }
     }
 
+    toggle(show) {
+        console.trace("attributes toggle", show);
+
+        super.toggle(show);
+    }
+
     syncDataListener({data}) {
         if (data.find(sd => sd.entityName === 'attributes' && sd.noteId === this.tabContext.note.noteId)) {
             // no need to invalidate attributes since the Attribute class listens to this as well
diff --git a/src/public/javascripts/widgets/basic_widget.js b/src/public/javascripts/widgets/basic_widget.js
index 359fd034a..cb5e3889e 100644
--- a/src/public/javascripts/widgets/basic_widget.js
+++ b/src/public/javascripts/widgets/basic_widget.js
@@ -10,8 +10,6 @@ class BasicWidget extends Component {
         $widget.find("[data-trigger-event]").on('click', e => {
             const eventName = $(e.target).attr('data-trigger-event');
 
-            console.log("Triggering " + eventName);
-
             this.appContext.trigger(eventName);
         });
 
diff --git a/src/public/javascripts/widgets/note_detail.js b/src/public/javascripts/widgets/note_detail.js
index 256bb486e..1b0eacf9b 100644
--- a/src/public/javascripts/widgets/note_detail.js
+++ b/src/public/javascripts/widgets/note_detail.js
@@ -36,9 +36,10 @@ export default class NoteDetailWidget extends TabAwareWidget {
         this.typeWidgetPromises = {};
 
         this.spacedUpdate = new SpacedUpdate(async () => {
-            const {noteFull} = this.tabContext;
-            const {noteId} = this.tabContext.note;
+            const {noteFull, note} = this.tabContext;
+            const {noteId} = note;
 
+            // FIXME hack
             const dto = note.dto;
             dto.content = noteFull.content = this.getTypeWidget().getContent();
 
diff --git a/src/public/javascripts/widgets/run_script_buttons.js b/src/public/javascripts/widgets/run_script_buttons.js
index b9573e985..a94a1e54f 100644
--- a/src/public/javascripts/widgets/run_script_buttons.js
+++ b/src/public/javascripts/widgets/run_script_buttons.js
@@ -1,7 +1,7 @@
 import TabAwareWidget from "./tab_aware_widget.js";
 
 const TPL = `
-<div>
+<div style="display: inline-flex;">
     <button class="btn btn-sm icon-button bx bx-play-circle render-button"
             title="Render"></button>
     
diff --git a/src/public/javascripts/widgets/standard_widget.js b/src/public/javascripts/widgets/standard_widget.js
index aa695ad35..d19573243 100644
--- a/src/public/javascripts/widgets/standard_widget.js
+++ b/src/public/javascripts/widgets/standard_widget.js
@@ -79,19 +79,12 @@ class StandardWidget extends TabAwareWidget {
         this.$headerActions = this.$widget.find('.widget-header-actions');
         this.$headerActions.append(...this.getHeaderActions());
 
-        // actual rendering is async
-        this.renderBody();
+        this.initialized = this.renderBody();
 
         return this.$widget;
     }
 
     async renderBody() {
-        // if (!this.isExpanded() || this.rendered) {
-        //     return;
-        // }
-        //
-        // this.rendered = true;
-
         await this.doRenderBody();
     }
 
diff --git a/src/public/javascripts/widgets/tab_caching_widget.js b/src/public/javascripts/widgets/tab_caching_widget.js
index 19cfde182..b049ea5e7 100644
--- a/src/public/javascripts/widgets/tab_caching_widget.js
+++ b/src/public/javascripts/widgets/tab_caching_widget.js
@@ -37,6 +37,10 @@ export default class TabCachingWidget extends TabAwareWidget {
         }
 
         widget.toggle(true);
+
+        // stop propagation of the event to the children, individual tab widget should not know about tab switching
+        // since they are per-tab
+        return false;
     }
 
     tabRemovedListener({tabId}) {