1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 6c853a037..0cb778067 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -434,7 +434,10 @@ public class AllAppsRecyclerView extends BaseRecyclerView
 
     private void setSectionFastScrollFocused(int position) {
         if (mPrevFastScrollFocusedSection != null) {
-            for (int i = 0; i < mPrevFastScrollFocusedSection.numApps; i++) {
+            ((AllAppsGridAdapter)getAdapter()).setFocusedSection(mPrevFastScrollFocusedSection);
+            int size = mPrevFastScrollFocusedSection.numApps +
+                    mPrevFastScrollFocusedSection.numOtherViews;
+            for (int i = 0; i < size; i++) {
                 int sectionPosition = position+i;
                 final ViewHolder vh = findViewHolderForAdapterPosition(sectionPosition);
                 if (vh != null &&
@@ -449,6 +452,11 @@ public class AllAppsRecyclerView extends BaseRecyclerView
         }
     }
 
+    @Override
+    public void setPreviousSectionFastScrollFocused() {
+        setSectionFastScrollFocused(mPrevFastScrollFocusedPosition);
+    }
+
     private void setSectionFastScrollDimmed(int position, boolean dimmed, boolean animate) {
         if (mPrevFastScrollFocusedSection != null) {
             for (int i = 0; i < mPrevFastScrollFocusedSection.numApps; i++) {