diff --git a/src/surge-xt/gui/SurgeGUIEditorOverlays.cpp b/src/surge-xt/gui/SurgeGUIEditorOverlays.cpp
index ff77e34ae2f..bcc8b543f29 100644
--- a/src/surge-xt/gui/SurgeGUIEditorOverlays.cpp
+++ b/src/surge-xt/gui/SurgeGUIEditorOverlays.cpp
@@ -366,8 +366,15 @@ void SurgeGUIEditor::showOverlay(OverlayTags olt,
     switch (olt)
     {
     case MSEG_EDITOR:
-        broadcastMSEGState();
-        // no break on purpose
+        onClose = [this]() {
+            broadcastMSEGState();
+            if (lfoEditSwitch)
+            {
+                lfoEditSwitch->setValue(0.0);
+                lfoEditSwitch->asJuceComponent()->repaint();
+            }
+        };
+        break;
     case FORMULA_EDITOR:
         onClose = [this]() {
             if (lfoEditSwitch)