diff --git a/Resources/oscilloscope/oscilloscope.html b/Resources/oscilloscope/oscilloscope.html
index e49bf510..ae76d74b 100644
--- a/Resources/oscilloscope/oscilloscope.html
+++ b/Resources/oscilloscope/oscilloscope.html
@@ -16,17 +16,16 @@
       height: 100%;
       width: 100%;
       overflow: hidden;
-    }
-
-    canvas {
-        width: min(100vw, 100vh);
-        height: min(100vw, 100vh);
-        position: absolute;
-        top: calc(calc(100vh - min(100vw, 100vh)) / 2);
-        left: calc(calc(100vw - min(100vw, 100vh)) / 2);
-        display: block;
-        margin: auto;
-        z-index: -1;
+    }
+
+    canvas {
+        width: min(100vw, 100vh);
+        height: min(100vw, 100vh);
+        position: absolute;
+        top: calc(calc(100vh - min(100vw, 100vh)) / 2);
+        left: calc(calc(100vw - min(100vw, 100vh)) / 2);
+        display: block;
+        margin: auto;
     }
     
     #overlay {
@@ -38,6 +37,7 @@
         justify-content: center;
         align-items: center;
         cursor: default;
+        z-index: 100;
     }
     
     table {
@@ -50,6 +50,7 @@
         bottom: 0;
         right: 0;
         display: none;
+        z-index: 99;
     }
     
     #buttonRow button {
diff --git a/Source/components/EffectComponent.cpp b/Source/components/EffectComponent.cpp
index 969737ef..d99c56c2 100644
--- a/Source/components/EffectComponent.cpp
+++ b/Source/components/EffectComponent.cpp
@@ -166,6 +166,7 @@ void EffectComponent::parameterGestureChanged(int parameterIndex, bool gestureIs
 
 void EffectComponent::handleAsyncUpdate() {
     setupComponent();
+    getParentComponent()->repaint();
     juce::SpinLock::ScopedLockType lock1(audioProcessor.parsersLock);
     juce::SpinLock::ScopedLockType lock2(audioProcessor.effectsLock);
     if (effect.getId().contains("lua")) {
diff --git a/Source/components/EffectsListComponent.h b/Source/components/EffectsListComponent.h
index 953828ba..ab990049 100644
--- a/Source/components/EffectsListComponent.h
+++ b/Source/components/EffectsListComponent.h
@@ -158,7 +158,7 @@ protected:
     Effect& effect;
     ComponentListModel listModel;
     juce::ListBox list;
-    jux::SwitchButton selected = { "switchButton", false };
+    jux::SwitchButton selected = { effect.enabled };
 private:
     OscirenderAudioProcessor& audioProcessor;
     OscirenderAudioProcessorEditor& editor;
diff --git a/Source/components/VisualiserComponent.cpp b/Source/components/VisualiserComponent.cpp
index 16c94fb2..ee49ff15 100644
--- a/Source/components/VisualiserComponent.cpp
+++ b/Source/components/VisualiserComponent.cpp
@@ -343,7 +343,9 @@ void VisualiserComponent::resized() {
 }
 
 void VisualiserComponent::childChanged() {
-    browser->emitEventIfBrowserIsVisible("childPresent", child != nullptr);
+    if (!oldVisualiser) {
+        browser->emitEventIfBrowserIsVisible("childPresent", child != nullptr);
+    }
 }
 
 void VisualiserComponent::popoutWindow() {