diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
index 3fe40e8e59..b89a122c04 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java
@@ -405,11 +405,6 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
                         mActivityInterface));
 
         notifyGestureStartedAsync();
-
-        DepthController depthController = mActivityInterface.getDepthController();
-        if (depthController != null) {
-            depthController.reapplyDepth();
-        }
     }
 
     private void onDeferredActivityLaunch() {
@@ -455,6 +450,11 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
         // high-res thumbnail loader here once we are sure that we will end up in an overview state
         RecentsModel.INSTANCE.get(mContext).getThumbnailCache()
                 .getHighResLoadingState().setVisible(true);
+
+        DepthController depthController = mActivityInterface.getDepthController();
+        if (depthController != null) {
+            depthController.reapplyDepth();
+        }
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index 97e80acbae..2ed6b03f59 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -214,12 +214,14 @@ public class DepthController implements StateHandler<LauncherState>,
         }
     }
 
-    private void setDepth(float depth) {
-        setDepth(depth, false);
+    public void reapplyDepth() {
+        LauncherState toState = mLauncher.getStateManager().getState();
+        float toDepth = toState.getDepth(mLauncher);
+        setDepth(toDepth, true);
     }
 
-    public void reapplyDepth() {
-        setDepth(mDepth, true);
+    private void setDepth(float depth) {
+        setDepth(depth, false);
     }
 
     private void setDepth(float depth, boolean force) {