diff --git a/src/gui/editing.cpp b/src/gui/editing.cpp
index 4b40c85ce..e41c399f2 100644
--- a/src/gui/editing.cpp
+++ b/src/gui/editing.cpp
@@ -2195,6 +2195,10 @@ void FurnaceGUI::doUndo() {
     }
   }
   if (shallReplay && e->isPlaying()) play();
+  
+  if (cursor.order!=curOrder) {
+    e->setOrder(cursor.order);
+  }
 
   if (curOrder>=e->curSubSong->ordersLen) {
     curOrder=e->curSubSong->ordersLen-1;
@@ -2272,6 +2276,10 @@ void FurnaceGUI::doRedo() {
   }
   if (shallReplay && e->isPlaying()) play();
 
+  if (cursor.order!=curOrder) {
+    e->setOrder(cursor.order);
+  }
+
   if (curOrder>=e->curSubSong->ordersLen) {
     curOrder=e->curSubSong->ordersLen-1;
     e->setOrder(curOrder);