diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 0865411d75..7eed3f0580 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1327,14 +1327,16 @@ public class Workspace extends SmoothPagedView
 
             float progress = (1.0f * scrollDelta) /
                     (getScrollForPage(index + 1) - getScrollForPage(index));
+            progress = Math.max(0, progress);
 
             setBackgroundAlpha(progress * 0.8f);
+            float transY = progress * (getViewportHeight() - getPageIndicator().getTop());
 
             if (mLauncher.getHotseat() != null) {
-                mLauncher.getHotseat().setTranslationX(translationX);
+                mLauncher.getHotseat().setTranslationY(transY);
             }
             if (getPageIndicator() != null) {
-                getPageIndicator().setTranslationX(translationX);
+                getPageIndicator().setAlpha(1 - progress);
             }
         }
     }