diff --git a/libraries/launcher-helper/src/android/support/test/launcherhelper/AutoLauncherStrategy.java b/libraries/launcher-helper/src/android/support/test/launcherhelper/AutoLauncherStrategy.java
index dcbe7e1..c547f0d 100644
--- a/libraries/launcher-helper/src/android/support/test/launcherhelper/AutoLauncherStrategy.java
+++ b/libraries/launcher-helper/src/android/support/test/launcherhelper/AutoLauncherStrategy.java
@@ -338,11 +338,11 @@
                 mDevice.waitForIdle();
             }
 
-            UiObject2 app = mDevice.findObject(appSelector);
+            UiObject2 app = mDevice.wait(Until.findObject(appSelector), UI_WAIT_TIMEOUT);
             while (app == null && down.isEnabled()) {
                 down.click();
                 mDevice.waitForIdle();
-                app = mDevice.findObject(appSelector);
+                app = mDevice.wait(Until.findObject(appSelector), UI_WAIT_TIMEOUT);
             }
             return app;
         } else {