diff --git a/src/org/geometerplus/zlibrary/ui/android/view/CurlAnimationProvider.java b/src/org/geometerplus/zlibrary/ui/android/view/CurlAnimationProvider.java
index f4f791ebb..ccfacc251 100644
--- a/src/org/geometerplus/zlibrary/ui/android/view/CurlAnimationProvider.java
+++ b/src/org/geometerplus/zlibrary/ui/android/view/CurlAnimationProvider.java
@@ -236,6 +236,7 @@ class CurlAnimationProvider extends AnimationProvider {
 		super.startAutoScrollingInternal(forward, startSpeed, direction, w, h, x, y, speed);
 		mySpeedFactor = (float)Math.pow(2.0, 0.25 * speed);
 		mySpeed *= 1.5;
+		doStep();
 	}
 
 	@Override
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/NoneAnimationProvider.java b/src/org/geometerplus/zlibrary/ui/android/view/NoneAnimationProvider.java
index 08d78918e..74862fdd2 100644
--- a/src/org/geometerplus/zlibrary/ui/android/view/NoneAnimationProvider.java
+++ b/src/org/geometerplus/zlibrary/ui/android/view/NoneAnimationProvider.java
@@ -21,7 +21,9 @@ package org.geometerplus.zlibrary.ui.android.view;
 
 import android.graphics.*;
 
-class NoneAnimationProvider extends SimpleAnimationProvider {
+import org.geometerplus.zlibrary.core.view.ZLView;
+
+class NoneAnimationProvider extends AnimationProvider {
 	private final Paint myPaint = new Paint();
 
 	NoneAnimationProvider(BitmapManager bitmapManager) {
@@ -39,4 +41,28 @@ class NoneAnimationProvider extends SimpleAnimationProvider {
 			terminate();
 		}
 	}
+
+	private ZLView.PageIndex myPageToScrollTo = ZLView.PageIndex.current;
+
+	@Override
+	protected void startAutoScrollingInternal(boolean forward, float startSpeed, ZLView.Direction direction, int w, int h, Integer x, Integer y, int speed) {
+		super.startAutoScrollingInternal(forward, startSpeed, direction, w, h, x, y, speed);
+		switch (direction) {
+			case rightToLeft:
+			case up:
+				myPageToScrollTo =
+					startSpeed > 0 ? ZLView.PageIndex.previous : ZLView.PageIndex.next;
+				break;
+			case leftToRight:
+			case down:
+				myPageToScrollTo =
+					startSpeed > 0 ? ZLView.PageIndex.next : ZLView.PageIndex.previous;
+				break;
+		}
+	}
+
+	@Override
+	ZLView.PageIndex getPageToScrollTo() {
+		return myPageToScrollTo;
+	}
 }
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/SimpleAnimationProvider.java b/src/org/geometerplus/zlibrary/ui/android/view/SimpleAnimationProvider.java
index 0245f8e06..6fe7878a6 100644
--- a/src/org/geometerplus/zlibrary/ui/android/view/SimpleAnimationProvider.java
+++ b/src/org/geometerplus/zlibrary/ui/android/view/SimpleAnimationProvider.java
@@ -47,6 +47,7 @@ abstract class SimpleAnimationProvider extends AnimationProvider {
 	protected void startAutoScrollingInternal(boolean forward, float startSpeed, ZLView.Direction direction, int w, int h, Integer x, Integer y, int speed) {
 		super.startAutoScrollingInternal(forward, startSpeed, direction, w, h, x, y, speed);
 		mySpeedFactor = (float)Math.pow(1.5, 0.25 * speed);
+		doStep();
 	}
 
 	@Override
diff --git a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
index b587062dd..200fbce50 100644
--- a/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
+++ b/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
@@ -190,7 +190,6 @@ public class ZLAndroidWidget extends View implements View.OnLongClickListener {
 				animator.startAutoScrolling(true, -3, direction, w, h, x, y, speed);
 				break;
 		}
-		animator.doStep();
 		postInvalidate();
 	}