diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 28b6ff9..0268378 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -198,9 +198,6 @@
     // Paint used to draw external drop outline
     private final Paint mExternalDragOutlinePaint = new Paint();
 
-    /** Used to trigger an animation as soon as the workspace stops scrolling. */
-    private Animator mAnimOnPageEndMoving = null;
-
     // Camera and Matrix used to determine the final position of a neighboring CellLayout
     private final Matrix mMatrix = new Matrix();
     private final Camera mCamera = new Camera();
@@ -527,11 +524,6 @@
         if (!mDragController.dragging()) {
             hideOutlines();
         }
-        // Check for an animation that's waiting to be started
-        if (mAnimOnPageEndMoving != null) {
-            mAnimOnPageEndMoving.start();
-            mAnimOnPageEndMoving = null;
-        }
         mOverScrollMaxBackgroundAlpha = 0.0f;
         mOverScrollPageIndex = -1;
         mPageMoving = false;
@@ -1557,12 +1549,7 @@
         });
 
         view.setVisibility(View.INVISIBLE);
-
-        if (!mScroller.isFinished()) {
-            mAnimOnPageEndMoving = mDropAnim;
-        } else {
-            mDropAnim.start();
-        }
+        mDropAnim.start();
     }
 
     /**
