diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index d191d07..29da4bf 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -819,23 +819,23 @@
     @Override
     protected void updateCurrentPageScroll() {
         super.updateCurrentPageScroll();
-        computeWallpaperScrollRatio();
+        computeWallpaperScrollRatio(mCurrentPage);
     }
 
     @Override
     protected void snapToPage(int whichPage) {
         super.snapToPage(whichPage);
-        computeWallpaperScrollRatio();
+        computeWallpaperScrollRatio(whichPage);
     }
 
-    private void computeWallpaperScrollRatio() {
+    private void computeWallpaperScrollRatio(int page) {
         // Here, we determine what the desired scroll would be with and without a layout scale,
         // and compute a ratio between the two. This allows us to adjust the wallpaper offset
         // as though there is no layout scale.
         float layoutScale = mLayoutScale;
-        int scaled = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage);
+        int scaled = getChildOffset(page) - getRelativeChildOffset(page);
         mLayoutScale = 1.0f;
-        float unscaled = getChildOffset(mCurrentPage) - getRelativeChildOffset(mCurrentPage);
+        float unscaled = getChildOffset(page) - getRelativeChildOffset(page);
         mLayoutScale = layoutScale;
         if (scaled > 0) {
             mWallpaperScrollRatio = (1.0f * unscaled) / scaled;
