diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index 8fbb512dc7..162035233d 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -206,6 +206,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
             return false;
         }
 
+        Animator childStateAnimation = null;
         // Found a visible recents task that matches the opening app, lets launch the app from there
         Animator launcherAnim;
         final AnimatorListenerAdapter windowAnimEndListener;
@@ -221,6 +222,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
                     mLauncher.getStateManager()
                             .createAnimationToNewWorkspace(NORMAL, RECENTS_LAUNCH_DURATION);
             controller.dispatchOnStart();
+            childStateAnimation = controller.getOriginalTarget();
             launcherAnim = controller.getAnimationPlayer().setDuration(RECENTS_LAUNCH_DURATION);
             windowAnimEndListener = new AnimatorListenerAdapter() {
                 @Override
@@ -237,7 +239,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
         // Set the current animation first, before adding windowAnimEndListener. Setting current
         // animation adds some listeners which need to be called before windowAnimEndListener
         // (the ordering of listeners matter in this case).
-        mLauncher.getStateManager().setCurrentAnimation(target);
+        mLauncher.getStateManager().setCurrentAnimation(target, childStateAnimation);
         target.addListener(windowAnimEndListener);
         return true;
     }
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 534c8ae351..d5e6a9ddde 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -354,8 +354,17 @@ public class LauncherStateManager {
     /**
      * Sets the animation as the current state animation, i.e., canceled when
      * starting another animation and may block some launcher interactions while running.
+     *
+     * @param childAnimations Set of animations with the new target is controlling.
      */
-    public void setCurrentAnimation(AnimatorSet anim) {
+    public void setCurrentAnimation(AnimatorSet anim, Animator... childAnimations) {
+        for (Animator childAnim : childAnimations) {
+            if (childAnim != null && mConfig.mCurrentAnimation == childAnim) {
+                mConfig.mCurrentAnimation.removeListener(mConfig);
+                mConfig.mCurrentAnimation = null;
+                break;
+            }
+        }
         boolean reapplyNeeded = mConfig.mCurrentAnimation != null;
         cancelAnimation();
         if (reapplyNeeded) {