diff --git a/src/gui/findReplace.cpp b/src/gui/findReplace.cpp
index 515a4b8ac..2a3601cc3 100644
--- a/src/gui/findReplace.cpp
+++ b/src/gui/findReplace.cpp
@@ -105,6 +105,8 @@ void FurnaceGUI::doFind() {
   if (curQueryRangeY==1) {
     finishSelection();
 
+    firstOrder=selStart.order;
+    lastOrder=selEnd.order;
     firstRow=selStart.y;
     lastRow=selEnd.y;
   }
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 731540e5f..95e2e7d46 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -5009,8 +5009,8 @@ bool FurnaceGUI::loop() {
       finishSelection();
       if (!mobileUI) {
         demandScrollX=true;
-        if (cursor.xCoarse==selStart.xCoarse && cursor.xFine==selStart.xFine && cursor.y==selStart.y &&
-            cursor.xCoarse==selEnd.xCoarse && cursor.xFine==selEnd.xFine && cursor.y==selEnd.y) {
+        if (cursor.xCoarse==selStart.xCoarse && cursor.xFine==selStart.xFine && cursor.y==selStart.y && cursor.order==selStart.order &&
+            cursor.xCoarse==selEnd.xCoarse && cursor.xFine==selEnd.xFine && cursor.y==selEnd.y && cursor.order==selEnd.order) {
           if (!settings.cursorMoveNoScroll) {
             updateScroll(cursor.y);
           }
diff --git a/src/gui/pattern.cpp b/src/gui/pattern.cpp
index 3faac3b5b..c0f6334e5 100644
--- a/src/gui/pattern.cpp
+++ b/src/gui/pattern.cpp
@@ -423,7 +423,7 @@ void FurnaceGUI::drawPattern() {
       if (e->isStepping()) pendingStepUpdate=1;
       cursor.y=oldRow;
       cursor.order=curOrder;
-      if (selStart.xCoarse==selEnd.xCoarse && selStart.xFine==selEnd.xFine && selStart.y==selEnd.y && !selecting) {
+      if (selStart.xCoarse==selEnd.xCoarse && selStart.xFine==selEnd.xFine && selStart.y==selEnd.y && selStart.order==selEnd.order && !selecting) {
         selStart=cursor;
         selEnd=cursor;
       }