diff --git a/src/gui/MSEGEditor.cpp b/src/gui/MSEGEditor.cpp
index 508368e6bfe..48364d3dddd 100644
--- a/src/gui/MSEGEditor.cpp
+++ b/src/gui/MSEGEditor.cpp
@@ -2688,28 +2688,18 @@ int32_t MSEGControlRegion::controlModifierClicked(CControl *pControl, CButtonSta
 
         if (isOnOff)
         {
-            if (pControl->getValue() > 0.5)
-            {
-                contextMenu.addItem(Surge::GUI::toOSCaseForMenu("Edit Value") + ": Off",
-                                    [pControl, this]() {
-                                        pControl->setValue(0);
-                                        pControl->valueChanged();
-                                        pControl->invalid();
-                                        canvas->invalid();
-                                        invalid();
-                                    });
-            }
-            else
-            {
-                contextMenu.addItem(Surge::GUI::toOSCaseForMenu("Edit Value") + ": On",
-                                    [pControl, this]() {
-                                        pControl->setValue(1);
-                                        pControl->valueChanged();
-                                        pControl->invalid();
-                                        canvas->invalid();
-                                        invalid();
-                                    });
-            }
+            bool ctrlVal = pControl->getValue() > 0.5;
+            auto val = ctrlVal ? 0.f : 1.f;
+            std::string onOff = ctrlVal ? "Off" : "On";
+
+            contextMenu.addItem(Surge::GUI::toOSCaseForMenu("Edit Value: ") + onOff,
+                                [pControl, val, this]() {
+                                    pControl->setValue(val);
+                                    pControl->valueChanged();
+                                    pControl->invalid();
+                                    canvas->invalid();
+                                    invalid();
+                                });
         }
         else
         {
diff --git a/src/gui/SurgeGUIEditor.cpp b/src/gui/SurgeGUIEditor.cpp
index fa656b3a3b2..fad4c357884 100644
--- a/src/gui/SurgeGUIEditor.cpp
+++ b/src/gui/SurgeGUIEditor.cpp
@@ -3945,60 +3945,53 @@ int32_t SurgeGUIEditor::controlModifierClicked(CControl *control, CButtonState b
 
 void SurgeGUIEditor::effectSettingsBackgroundClick(int whichScene)
 {
-    CPoint where;
-    CRect menuRect;
-    frame->getCurrentMouseLocation(where);
-    frame->localToFrame(where);
-
-    menuRect.offset(where.x, where.y);
-
-    auto effmen = new COptionMenu(menuRect, 0, 0, 0, 0,
-                                  VSTGUI::COptionMenu::kNoDrawStyle |
-                                      VSTGUI::COptionMenu::kMultipleCheckStyle);
+    auto fxGridMenu = juce::PopupMenu();
 
     auto msurl = SurgeGUIEditor::helpURLForSpecial("fx-selector");
     auto hurl = SurgeGUIEditor::fullyResolvedHelpURL(msurl);
-    std::string txt;
 
-    addCallbackMenu(effmen, "[?] Effect Settings",
-                    [hurl]() { juce::URL(hurl).launchInDefaultBrowser(); });
+    fxGridMenu.addItem("[?] Effect Settings", [hurl]() { juce::URL(hurl).launchInDefaultBrowser(); });
 
-    effmen->addSeparator();
+    fxGridMenu.addSeparator();
 
     std::string sc = std::string("Scene ") + (char)('A' + whichScene);
 
-    txt = sc + Surge::GUI::toOSCaseForMenu(" Hard Clip Disabled");
-    auto hcmen = addCallbackMenu(effmen, txt.c_str(), [this, whichScene]() {
-        this->synth->storage.sceneHardclipMode[whichScene] = SurgeStorage::BYPASS_HARDCLIP;
-    });
-    hcmen->setChecked(synth->storage.sceneHardclipMode[whichScene] ==
-                      SurgeStorage::BYPASS_HARDCLIP);
-
-    txt = sc + Surge::GUI::toOSCaseForMenu(" Hard Clip at 0 dBFS");
-    hcmen = addCallbackMenu(effmen, txt.c_str(), [this, whichScene]() {
-        this->synth->storage.sceneHardclipMode[whichScene] = SurgeStorage::HARDCLIP_TO_0DBFS;
-    });
-    hcmen->setChecked(synth->storage.sceneHardclipMode[whichScene] ==
-                      SurgeStorage::HARDCLIP_TO_0DBFS);
+    fxGridMenu.addItem(sc + Surge::GUI::toOSCaseForMenu(" Hard Clip Disabled"), true,
+                   (synth->storage.sceneHardclipMode[whichScene] == SurgeStorage::BYPASS_HARDCLIP),
+                   [this, whichScene]() {
+                       this->synth->storage.sceneHardclipMode[whichScene] =
+                           SurgeStorage::BYPASS_HARDCLIP;
+                   });
+
+    fxGridMenu.addItem(
+        sc + Surge::GUI::toOSCaseForMenu(" Hard Clip at 0 dBFS"), true,
+        (synth->storage.sceneHardclipMode[whichScene] == SurgeStorage::HARDCLIP_TO_0DBFS),
+        [this, whichScene]() {
+            this->synth->storage.sceneHardclipMode[whichScene] = SurgeStorage::HARDCLIP_TO_0DBFS;
+        });
 
-    txt = sc + Surge::GUI::toOSCaseForMenu(" Hard Clip at +18 dBFS");
-    hcmen = addCallbackMenu(effmen, txt.c_str(), [this, whichScene]() {
-        this->synth->storage.sceneHardclipMode[whichScene] = SurgeStorage::HARDCLIP_TO_18DBFS;
-    });
-    hcmen->setChecked(synth->storage.sceneHardclipMode[whichScene] ==
-                      SurgeStorage::HARDCLIP_TO_18DBFS);
+    fxGridMenu.addItem(
+        sc + Surge::GUI::toOSCaseForMenu(" Hard Clip at +18 dBFS"), true,
+        (synth->storage.sceneHardclipMode[whichScene] == SurgeStorage::HARDCLIP_TO_18DBFS),
+        [this, whichScene]() {
+            this->synth->storage.sceneHardclipMode[whichScene] = SurgeStorage::HARDCLIP_TO_18DBFS;
+        });
 
-    frame->addView(effmen);
-    effmen->popup();
-    frame->removeView(effmen, true);
+    fxGridMenu.showMenuAsync(juce::PopupMenu::Options());
 }
 
 void SurgeGUIEditor::valueChanged(CControl *control)
 {
     if (!frame)
+    {
         return;
+    }
+
     if (!editor_open)
+    {
         return;
+    }
+
     long tag = control->getTag();
 
     if (typeinDialog != nullptr && tag != tag_value_typein)