diff --git a/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java b/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java
index 85e77f4..78e94e8 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/GridLayoutManager.java
@@ -1442,7 +1442,10 @@
         }
 
         final boolean hasDoneFirstLayout = hasDoneFirstLayout();
+        int savedFocusPos = mFocusPosition;
+        boolean fastRelayout = false;
         if (!mState.didStructureChange() && !mForceFullLayout && hasDoneFirstLayout) {
+            fastRelayout = true;
             fastRelayout();
         } else {
             boolean hadFocus = mBaseGridView.hasFocus();
@@ -1523,7 +1526,7 @@
 
         if (!state.isPreLayout()) {
             mUseDeltaInPreLayout = false;
-            if (!hasDoneFirstLayout) {
+            if (!fastRelayout || mFocusPosition != savedFocusPos) {
                 dispatchChildSelected();
             }
         }
@@ -1817,9 +1820,9 @@
      */
     private void scrollToView(View view, boolean smooth) {
         int newFocusPosition = getPositionByView(view);
-        if (mInLayout || newFocusPosition != mFocusPosition) {
+        if (newFocusPosition != mFocusPosition) {
             mFocusPosition = newFocusPosition;
-            if (mState == null || !mState.isPreLayout()) {
+            if (!mInLayout) {
                 dispatchChildSelected();
             }
         }