diff --git a/src/gui/editing.cpp b/src/gui/editing.cpp
index 0d8341b28..77d76da24 100644
--- a/src/gui/editing.cpp
+++ b/src/gui/editing.cpp
@@ -1005,6 +1005,13 @@ void FurnaceGUI::doUndo() {
       break;
   }
 
+  if (curOrder>=e->curSubSong->ordersLen) {
+    curOrder=e->curSubSong->ordersLen-1;
+    oldOrder=curOrder;
+    oldOrder1=curOrder;
+    e->setOrder(curOrder);
+  }
+
   undoHist.pop_back();
 }
 
@@ -1058,5 +1065,12 @@ void FurnaceGUI::doRedo() {
       break;
   }
 
+  if (curOrder>=e->curSubSong->ordersLen) {
+    curOrder=e->curSubSong->ordersLen-1;
+    oldOrder=curOrder;
+    oldOrder1=curOrder;
+    e->setOrder(curOrder);
+  }
+
   redoHist.pop_back();
 }