diff --git a/src/surge-xt/gui/overlays/ModulationEditor.cpp b/src/surge-xt/gui/overlays/ModulationEditor.cpp
index 96d1f3f3796..233827e3b61 100644
--- a/src/surge-xt/gui/overlays/ModulationEditor.cpp
+++ b/src/surge-xt/gui/overlays/ModulationEditor.cpp
@@ -553,7 +553,7 @@ struct ModulationListContents : public juce::Component, public Surge::GUI::SkinC
 
         for (auto &r : rows)
         {
-            r->isAfterTop = prior;
+            r->isAfterTop = prior && yPos < -4; // that's about scroll for first. #5602
             prior = r->isTop;
         }
 
diff --git a/src/surge-xt/gui/widgets/LFOAndStepDisplay.cpp b/src/surge-xt/gui/widgets/LFOAndStepDisplay.cpp
index a3875186b81..f72354ef0f9 100644
--- a/src/surge-xt/gui/widgets/LFOAndStepDisplay.cpp
+++ b/src/surge-xt/gui/widgets/LFOAndStepDisplay.cpp
@@ -1698,7 +1698,14 @@ void LFOAndStepDisplay::mouseDrag(const juce::MouseEvent &event)
     }
     case VALUES:
     {
-        setStepValue(event);
+        if (event.mods.isCommandDown())
+        {
+            setStepToDefault(event);
+        }
+        else
+        {
+            setStepValue(event);
+        }
         break;
     }
     }