diff --git a/DroidFish/res/values/strings.xml b/DroidFish/res/values/strings.xml
index 70b5ebb..5f1ee82 100644
--- a/DroidFish/res/values/strings.xml
+++ b/DroidFish/res/values/strings.xml
@@ -306,6 +306,8 @@ you are not actively using the program.\
     <string name="prefs_scrollSensitivity_summary">Scrolling speed for game navigation</string>
     <string name="prefs_invertScrollDirection_title">Invert Scroll Direction</string>
     <string name="prefs_invertScrollDirection_summary">Enable this if you think scrolling moves in the wrong direction</string>
+    <string name="prefs_autoScrollMoveList_title">Auto scroll move list</string>
+    <string name="prefs_autoScrollMoveList_summary">Automatically scroll the move list to the current board position</string>
     <string name="prefs_discardVariations_title">Discard variations</string>
     <string name="prefs_discardVariations_summary">Discard non-mainline moves from move list</string>
     <string name="prefs_leftHanded_title">Left-handed mode</string>
diff --git a/DroidFish/res/xml/preferences.xml b/DroidFish/res/xml/preferences.xml
index 36d92c8..caa23be 100644
--- a/DroidFish/res/xml/preferences.xml
+++ b/DroidFish/res/xml/preferences.xml
@@ -521,6 +521,12 @@
             android:summary="@string/prefs_invertScrollDirection_summary"
             android:defaultValue="false">
         </CheckBoxPreference>
+        <CheckBoxPreference
+            android:key="autoScrollMoveList"
+            android:title="@string/prefs_autoScrollMoveList_title"
+            android:summary="@string/prefs_autoScrollMoveList_summary"
+            android:defaultValue="true">
+        </CheckBoxPreference>
         <ListPreference
             android:key="autoDelay"
             android:title="@string/prefs_autoDelay_title"
diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java
index 2f6abe4..6d05bc8 100644
--- a/DroidFish/src/org/petero/droidfish/DroidFish.java
+++ b/DroidFish/src/org/petero/droidfish/DroidFish.java
@@ -212,6 +212,7 @@ public class DroidFish extends Activity
 
     private float scrollSensitivity;
     private boolean invertScrollDirection;
+    private boolean autoScrollMoveList;
 
     private boolean leftHanded;
     private boolean soundEnabled;
@@ -1182,6 +1183,7 @@ public class DroidFish extends Activity
 
         scrollSensitivity = Float.parseFloat(settings.getString("scrollSensitivity", "2"));
         invertScrollDirection = settings.getBoolean("invertScrollDirection", false);
+        autoScrollMoveList = settings.getBoolean("autoScrollMoveList", true);
         discardVariations = settings.getBoolean("discardVariations", false);
         Util.setFullScreenMode(this, settings);
         useWakeLock = settings.getBoolean("wakeLock", false);
@@ -1903,7 +1905,7 @@ public class DroidFish extends Activity
         moveList.setText(gameTextListener.getText());
         int currPos = gameTextListener.getCurrPos();
         int line = moveList.getLineForOffset(currPos);
-        if (line >= 0) {
+        if (line >= 0 && autoScrollMoveList) {
             int y = (line - 1) * moveList.getLineHeight();
             moveListScroll.scrollTo(0, y);
         }