diff --git a/wlauto/workloads/facebook/__init__.py b/wlauto/workloads/facebook/__init__.py
index 69b2af1a..9f456ee3 100644
--- a/wlauto/workloads/facebook/__init__.py
+++ b/wlauto/workloads/facebook/__init__.py
@@ -44,6 +44,7 @@ class Facebook(AndroidUiAutoBenchmark):
     """
     package = 'com.facebook.katana'
     activity = '.LoginActivity'
+    max_apk_version = '3.4'
 
     #'du' specify 'disable update'
     du_activity = 'com.android.vending/.AssetBrowserActivity'
diff --git a/wlauto/workloads/facebook/com.arm.wlauto.uiauto.facebook.jar b/wlauto/workloads/facebook/com.arm.wlauto.uiauto.facebook.jar
index 098030b0..3c25cda4 100644
Binary files a/wlauto/workloads/facebook/com.arm.wlauto.uiauto.facebook.jar and b/wlauto/workloads/facebook/com.arm.wlauto.uiauto.facebook.jar differ
diff --git a/wlauto/workloads/facebook/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/facebook/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
index 3c9dbb2c..83735757 100644
--- a/wlauto/workloads/facebook/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
+++ b/wlauto/workloads/facebook/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
@@ -131,10 +131,8 @@ public class UiAutomation extends BaseUiAutomation {
 
         //Search for the facebook account
         UiObject clickBar = new UiObject(new UiSelector()
-             .className("android.view.View").index(0)
-             .childSelector(new UiSelector()
              .className("android.widget.ImageButton").index(0)
-             .description("Main navigation menu")));
+             .description("Main navigation menu"));
         clickBar.clickAndWaitForNewWindow(timeout);
 
         UiObject clickSearch = new UiObject(new UiSelector()
@@ -189,7 +187,6 @@ public class UiAutomation extends BaseUiAutomation {
              .className("android.widget.RelativeLayout").index(3));
         friends.click();
         sleep(timeout);
-        getUiDevice().pressBack();
 
         //Update the status
         UiObject updateStatus = new UiObject(new UiSelector()
@@ -197,7 +194,7 @@ public class UiAutomation extends BaseUiAutomation {
              .childSelector(new UiSelector()
              .className("android.widget.FrameLayout").index(1)
              .childSelector(new UiSelector()
-             .className("android.widget.RelativeLayout").index(1)
+             .className("android.widget.RelativeLayout").index(0)
              .childSelector(new UiSelector()
              .className("android.widget.LinearLayout").index(0)
              .childSelector(new UiSelector()