             scrollProperty = HORIZONTAL_SCROLL_POSITION;
         else if (canScrollVertically)
             scrollProperty = VERTICAL_SCROLL_POSITION;
+        
+        // If there's an animation playing, we need
+        // to stop it before we snap the element into
+        // position.
+        stopAnimations();
 
         if (animate)
         {

			return null;
        }
    }
    
    //--------------------------------------------------------------------------
    // 

        
        if (pageScrollingChanged)
        {
            stopAnimations();
            determineCurrentPageScrollPosition();
            pageScrollingChanged = false;
        }
        
        if (snappingModeChanged)
        {
            stopAnimations();
            snapContentScrollPosition();
            snappingModeChanged = false;                
        }
