diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index b0557b4de3..21e12c7b73 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -525,9 +525,14 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
 
             // Since we are changing the start position of the UI, reapply the state, at the
             // end
-            controller.setEndAction(() -> mActivity.getStateManager().goToState(
-                    controller.getInterpolatedProgress() > 0.5 ? mTargetState : mBackgroundState,
-                    false));
+            controller.setEndAction(() -> {
+                if (mBackgroundState == mActivity.getStateManager().getState()) {
+                    mActivity.getStateManager().goToState(
+                            controller.getInterpolatedProgress() > 0.5 ? mTargetState
+                                    : mBackgroundState,
+                            false);
+                }
+            });
 
             RecentsView recentsView = mActivity.getOverviewPanel();
             AnimatorControllerWithResistance controllerWithResistance = AnimatorControllerWithResistance