1 files changed, 2 insertions, 0 deletions
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 0be09f0d9..bf8f64efc 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -134,12 +134,14 @@ public final class LauncherInstrumentation {
                 return waitForLauncherObject(WIDGETS_RES_ID);
             }
             case ALL_APPS: {
+                waitUntilGone(WORKSPACE_RES_ID);
                 waitUntilGone(OVERVIEW_RES_ID);
                 waitUntilGone(WIDGETS_RES_ID);
                 return waitForLauncherObject(APPS_RES_ID);
             }
             case OVERVIEW: {
                 waitForLauncherObject(APPS_RES_ID);
+                waitUntilGone(WORKSPACE_RES_ID);
                 waitUntilGone(WIDGETS_RES_ID);
                 return waitForLauncherObject(OVERVIEW_RES_ID);
             }