diff --git a/TODO.md b/TODO.md
index c813fbfe..a3e82986 100644
--- a/TODO.md
+++ b/TODO.md
@@ -29,7 +29,6 @@
 - try to find out why does VSlider not accept keyboard input
 - finish lock layout
 - if macros have release, note off should release them
-- add "don't scroll on cursor movement" option
 - add ability to select entire row when clicking on row number
 - store edit/followOrders/followPattern state in config
 - add ability to select a column by double clicking
@@ -38,5 +37,4 @@
 - settings: OK/Cancel buttons should be always visible
 - Apply button in settings
 - better FM chip names (number and codename)
-- find and replace
-- precise panning effects (80xx linear, 81xx/82xx per-channel)
+- find and replace
\ No newline at end of file
diff --git a/src/gui/cursor.cpp b/src/gui/cursor.cpp
index 1fdf64d7..82f4a16a 100644
--- a/src/gui/cursor.cpp
+++ b/src/gui/cursor.cpp
@@ -193,7 +193,9 @@ void FurnaceGUI::moveCursor(int x, int y, bool select) {
     selStart=cursor;
   }
   selEnd=cursor;
-  updateScroll(cursor.y);
+  if (!settings.cursorMoveNoScroll) {
+    updateScroll(cursor.y);
+  }
   e->setMidiBaseChan(cursor.xCoarse);
 }
 
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index ee94e8fe..e82a16ae 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -2350,7 +2350,9 @@ bool FurnaceGUI::loop() {
             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) {
-              updateScroll(cursor.y);
+              if (!settings.cursorMoveNoScroll) {
+                updateScroll(cursor.y);
+              }
             }
           }
           break;