diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/SuggestionsController.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/SuggestionsController.java
index de478b9c9..7b95892ef 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/SuggestionsController.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/SuggestionsController.java
@@ -105,13 +105,6 @@ public class SuggestionsController extends PlayerEventListenerHelper {
 
         VideoGroup group = item.getGroup();
 
-        if (group == null || mLastScrollGroup == group.getMediaGroup()) {
-            Log.d(TAG, "Can't continue group. Another action is running.");
-            return;
-        }
-
-        mLastScrollGroup = group.getMediaGroup();
-
         continueGroup(group);
     }
 
@@ -165,9 +158,17 @@ public class SuggestionsController extends PlayerEventListenerHelper {
 
     private void continueGroup(VideoGroup group, OnVideoGroup callback, boolean showLoading) {
         if (group == null) {
+            Log.e(TAG, "Can't continue group. The group is null.");
             return;
         }
 
+        if (mLastScrollGroup == group.getMediaGroup()) {
+            Log.d(TAG, "Can't continue group. Another action is running.");
+            return;
+        }
+
+        mLastScrollGroup = group.getMediaGroup();
+
         Log.d(TAG, "continueGroup: start continue group: " + group.getTitle());
 
         if (showLoading) {
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 61b8344d7..a952fc6d4 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
@@ -408,20 +408,6 @@ public class BrowsePresenter extends BasePresenter<BrowseView> implements Sectio
 
         VideoGroup group = item.getGroup();
 
-        if (group == null || group.getMediaGroup() == null) {
-            Log.e(TAG, "Can't scroll. Video group is null.");
-            return;
-        }
-
-        if (mLastScrollGroup == group.getMediaGroup()) {
-            Log.d(TAG, "Can't continue group. Another action is running.");
-            return;
-        }
-
-        mLastScrollGroup = group.getMediaGroup();
-
-        Log.d(TAG, "onScrollEnd. Group title: " + group.getTitle());
-
         continueGroup(group);
     }
 
@@ -747,6 +733,18 @@ public class BrowsePresenter extends BasePresenter<BrowseView> implements Sectio
             return;
         }
 
+        if (group == null) {
+            Log.e(TAG, "Can't continue group. The group is null.");
+            return;
+        }
+
+        if (mLastScrollGroup == group.getMediaGroup()) {
+            Log.d(TAG, "Can't continue group. Another action is running.");
+            return;
+        }
+
+        mLastScrollGroup = group.getMediaGroup();
+
         Log.d(TAG, "continueGroup: start continue group: " + group.getTitle());
 
         // Small amount of items == small load time. Loading bar are useless?
diff --git a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/misc/ProgressBarManager.java b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/misc/ProgressBarManager.java
index a2f5cf413..df1b990b7 100644
--- a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/misc/ProgressBarManager.java
+++ b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/misc/ProgressBarManager.java
@@ -93,7 +93,8 @@ public final class ProgressBarManager {
         if (mEnableProgressBar) {
             mIsShowing = true;
             mHandler.removeCallbacks(hideRunnable);
-            mHandler.postDelayed(showRunnable, mInitialDelay);
+            //mHandler.postDelayed(showRunnable, mInitialDelay);
+            mHandler.post(showRunnable);
         }
     }