diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 02d18a03f5e5..19b1c44e0b53 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -1180,8 +1180,10 @@ abstract public class BrowserApp extends GeckoApp
                                                         AboutHomeContent.UpdateFlags.REMOTE_TABS));
                 }
                 mAboutHomeContent.setVisibility(View.VISIBLE);
+                mBrowserToolbar.setNextFocusDownId(R.id.abouthome_content);
             } else {
                 findViewById(R.id.abouthome_content).setVisibility(View.GONE);
+                mBrowserToolbar.setNextFocusDownId(R.id.layer_view);
             }
 
             // Refresh margins to possibly restore the toolbar padding
diff --git a/mobile/android/base/BrowserToolbar.java b/mobile/android/base/BrowserToolbar.java
index 1215289931f0..522a0d2afb15 100644
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -558,6 +558,18 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
         return mVisibility == ToolbarVisibility.VISIBLE;
     }
 
+    public void setNextFocusDownId(int nextId) {
+        mAwesomeBar.setNextFocusDownId(nextId);
+        mTabs.setNextFocusDownId(nextId);
+        mBack.setNextFocusDownId(nextId);
+        mForward.setNextFocusDownId(nextId);
+        mFavicon.setNextFocusDownId(nextId);
+        mStop.setNextFocusDownId(nextId);
+        mSiteSecurity.setNextFocusDownId(nextId);
+        mReader.setNextFocusDownId(nextId);
+        mMenu.setNextFocusDownId(nextId);
+    }
+
     @Override
     public void onAnimationStart(Animation animation) {
         if (animation.equals(mLockFadeIn)) {