diff --git a/src/gui/pattern.cpp b/src/gui/pattern.cpp
index ee06a1b8..fa00243c 100644
--- a/src/gui/pattern.cpp
+++ b/src/gui/pattern.cpp
@@ -320,7 +320,13 @@ void FurnaceGUI::drawPattern() {
   bool inhibitMenu=false;
   float scrollX=0;
 
-  if (e->isPlaying() && followPattern && (!e->isStepping() || pendingStepUpdate)) cursor.y=oldRow+((pendingStepUpdate)?1:0);
+  if (e->isPlaying() && followPattern && (!e->isStepping() || pendingStepUpdate)) {
+    cursor.y=oldRow+((pendingStepUpdate)?1:0);
+    if (selStart.xCoarse==selEnd.xCoarse && selStart.xFine==selEnd.xFine && selStart.y==selEnd.y && !selecting) {
+      selStart=cursor;
+      selEnd=cursor;
+    }
+  }
   demandX=0;
   sel1=selStart;
   sel2=selEnd;