diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/BrowsePresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/BrowsePresenter.java
index b16facfd44..977baa72c0 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/BrowsePresenter.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/BrowsePresenter.java
@@ -447,7 +447,6 @@ public void onSectionFocused(int sectionId) {
         saveSelectedItems(); // save previous state
         mCurrentSection = findSectionById(sectionId);
         mCurrentVideo = null; // fast scroll through the sections (fix empty selected item)
-        restoreSelectedItems();
         updateCurrentSection();
     }
 
@@ -658,6 +657,14 @@ private void updateVideoRows(BrowseSection section, Observable<List<MediaGroup>>
         firstGroup.setAction(VideoGroup.ACTION_REPLACE);
         getView().updateSection(firstGroup);
 
+        if (groups == null) {
+            // No group. Maybe just clear.
+            getView().showProgressBar(false);
+            return;
+        }
+
+        restoreSelectedItems(); // Don't place anywhere else
+
         Disposable updateAction = groups
                 .subscribe(
                         mediaGroups -> {
@@ -710,7 +717,7 @@ private void updateVideoGrid(BrowseSection section, Observable<MediaGroup> group
             return;
         }
 
-        //restoreSelectedItems();
+        restoreSelectedItems(); // Don't place anywhere else
 
         Disposable updateAction = group
                 .subscribe(