diff --git a/src/gui/songInfo.cpp b/src/gui/songInfo.cpp
index e9caf5af9..b5923801e 100644
--- a/src/gui/songInfo.cpp
+++ b/src/gui/songInfo.cpp
@@ -124,6 +124,9 @@ void FurnaceGUI::drawSongInfo() {
         if (ordLen<1) ordLen=1;
         if (ordLen>127) ordLen=127;
         e->song.ordersLen=ordLen;
+        if (e->getOrder()>=ordLen) {
+          e->setOrder(ordLen-1);
+        }
       }
 
       ImGui::TableNextRow();