diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index f97513467..886edc990 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -4407,7 +4407,7 @@ bool FurnaceGUI::loop() {
     e->getPlayPos(nextPlayOrder,nextOldRow);
     oldRowChanged=false;
     playOrder=nextPlayOrder;
-    if (followPattern && !e->isStepping()) {
+    if (followPattern && (!e->isStepping() || pendingStepUpdate)) {
       curOrder=playOrder;
     }
     if (e->isPlaying()) {