diff --git a/quickstep/src/com/android/quickstep/util/ScalingWorkspaceRevealAnim.kt b/quickstep/src/com/android/quickstep/util/ScalingWorkspaceRevealAnim.kt
index 63eae921b0..97d7ed1a63 100644
--- a/quickstep/src/com/android/quickstep/util/ScalingWorkspaceRevealAnim.kt
+++ b/quickstep/src/com/android/quickstep/util/ScalingWorkspaceRevealAnim.kt
@@ -25,6 +25,7 @@ import android.graphics.RectF
 import android.util.Log
 import android.view.View
 import android.view.animation.PathInterpolator
+import androidx.core.animation.doOnStart
 import androidx.core.graphics.transform
 import com.android.app.animation.Animations
 import com.android.app.animation.Interpolators
@@ -241,7 +242,11 @@ class ScalingWorkspaceRevealAnim(
     }
 
     fun getAnimators(): AnimatorSet {
-        return animation.buildAnim()
+        val animatorSet = animation.buildAnim()
+        animatorSet.doOnStart {
+            launcher.stateManager.setCurrentAnimation(animatorSet, LauncherState.NORMAL)
+        }
+        return animatorSet
     }
 
     fun start() {
diff --git a/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java b/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java
index 32e0e132e0..e86adb81fb 100644
--- a/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java
+++ b/quickstep/src/com/android/quickstep/util/WorkspaceRevealAnim.java
@@ -91,7 +91,9 @@ public class WorkspaceRevealAnim {
             PendingAnimation depthBuilder = new PendingAnimation(DURATION_MS);
             DepthController depth = ((QuickstepLauncher) launcher).getDepthController();
             depth.setStateWithAnimation(NORMAL, new StateAnimationConfig(), depthBuilder);
-            mAnimators.play(depthBuilder.buildAnim());
+            AnimatorSet animatorSet = depthBuilder.buildAnim();
+            launcher.getStateManager().setCurrentAnimation(animatorSet, NORMAL);
+            mAnimators.play(animatorSet);
         }
 
         // Add sysui scrim animation.