diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 6950c72f4..b919fd255 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -4440,6 +4440,10 @@ bool FurnaceGUI::loop() {
 
     MEASURE(calcChanOsc,calcChanOsc());
 
+    if (followPattern) {
+      curOrder=e->getOrder();
+    }
+
     if (mobileUI) {
       globalWinFlags=ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoBringToFrontOnFocus;
       //globalWinFlags=ImGuiWindowFlags_NoTitleBar;
diff --git a/src/gui/pattern.cpp b/src/gui/pattern.cpp
index c21372466..2805af02a 100644
--- a/src/gui/pattern.cpp
+++ b/src/gui/pattern.cpp
@@ -420,9 +420,6 @@ void FurnaceGUI::drawPattern() {
     //char id[32];
     ImGui::PushFont(patFont);
     int ord=oldOrder;
-    if (followPattern) {
-      curOrder=e->getOrder();
-    }
     oldOrder=curOrder;
     int chans=e->getTotalChannelCount();
     int displayChans=0;