diff --git a/src/gui/pattern.cpp b/src/gui/pattern.cpp
index 6c84c8d76..3d38deef8 100644
--- a/src/gui/pattern.cpp
+++ b/src/gui/pattern.cpp
@@ -378,7 +378,7 @@ void FurnaceGUI::drawPattern() {
   bool inhibitMenu=false;
 
   if (e->isPlaying() && followPattern && (!e->isStepping() || pendingStepUpdate)) {
-    cursor.y=oldRow+((pendingStepUpdate)?1:0);
+    cursor.y=e->getRow();
     if (selStart.xCoarse==selEnd.xCoarse && selStart.xFine==selEnd.xFine && selStart.y==selEnd.y && !selecting) {
       selStart=cursor;
       selEnd=cursor;