diff --git a/src/gui/doAction.cpp b/src/gui/doAction.cpp
index a0f5af022..7849d4ee3 100644
--- a/src/gui/doAction.cpp
+++ b/src/gui/doAction.cpp
@@ -1685,11 +1685,17 @@ void FurnaceGUI::doAction(int what) {
     case GUI_ACTION_ORDERS_UP:
       if (curOrder>0) {
         setOrder(curOrder-1);
+        if (orderEditMode!=0) {
+          curNibble=false;
+        }
       }
       break;
     case GUI_ACTION_ORDERS_DOWN:
       if (curOrder<e->curSubSong->ordersLen-1) {
         setOrder(curOrder+1);
+        if (orderEditMode!=0) {
+          curNibble=false;
+        }
       }
       break;
     case GUI_ACTION_ORDERS_LEFT: {
@@ -1702,6 +1708,9 @@ void FurnaceGUI::doAction(int what) {
           break;
         }
       } while (!e->curSubSong->chanShow[orderCursor]);
+      if (orderEditMode!=0) {
+        curNibble=false;
+      }
       break;
     }
     case GUI_ACTION_ORDERS_RIGHT: {
@@ -1714,6 +1723,9 @@ void FurnaceGUI::doAction(int what) {
           break;
         }
       } while (!e->curSubSong->chanShow[orderCursor]);
+      if (orderEditMode!=0) {
+        curNibble=false;
+      }
       break;
     }
     case GUI_ACTION_ORDERS_INCREASE: {
@@ -1721,6 +1733,9 @@ void FurnaceGUI::doAction(int what) {
       if (e->curOrders->ord[orderCursor][curOrder]<0xff) {
         e->curOrders->ord[orderCursor][curOrder]++;
       }
+      if (orderEditMode!=0) {
+        curNibble=false;
+      }
       break;
     }
     case GUI_ACTION_ORDERS_DECREASE: {
@@ -1728,6 +1743,9 @@ void FurnaceGUI::doAction(int what) {
       if (e->curOrders->ord[orderCursor][curOrder]>0) {
         e->curOrders->ord[orderCursor][curOrder]--;
       }
+      if (orderEditMode!=0) {
+        curNibble=false;
+      }
       break;
     }
     case GUI_ACTION_ORDERS_EDIT_MODE: