diff --git a/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.jar b/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.jar
index 2ca5e536..963e1c70 100644
Binary files a/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.jar and b/wlauto/workloads/adobereader/com.arm.wlauto.uiauto.adobereader.jar differ
diff --git a/wlauto/workloads/adobereader/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/adobereader/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
index d634cd75..ef27fc77 100755
--- a/wlauto/workloads/adobereader/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
+++ b/wlauto/workloads/adobereader/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
@@ -266,7 +266,7 @@ public class UiAutomation extends UxPerfUiAutomation {
         // Return from the document view to the file list view by pressing home and my documents.
         UiObject actionBar =
                 new UiObject(new UiSelector().resourceIdMatches(".*action_bar.*")
-                                             .className("android.view.View"));
+                                             .classNameMatches("android.view.View.*"));
         if (!actionBar.exists()){
             tapDisplayCentre();
         }
@@ -274,14 +274,13 @@ public class UiAutomation extends UxPerfUiAutomation {
         UiObject homeButton =
             new UiObject(new UiSelector().resourceId("android:id/home")
                                          .className("android.widget.ImageView"));
-
-        //Newer version of app have a menu button instead of home button.
+        // Newer version of app have a menu button instead of home button.
         UiObject menuButton =
             new UiObject(new UiSelector().description("Navigate up")
                                          .classNameMatches("android.widget.Image.*"));
 
-        if (menuButton.exists()){
-            menuButton.clickAndWaitForNewWindow();
+        if (homeButton.exists()){
+            homeButton.clickAndWaitForNewWindow();
         }
         else if (menuButton.exists()){
             menuButton.clickAndWaitForNewWindow();