diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
index e512a493..93393089 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
@@ -225,6 +225,12 @@ public class ThreadPresenter implements ChanLoader.ChanLoaderCallback, PostAdapt
             }
         }
 
+        if (isWatching()) {
+            chanLoader.setTimer();
+        }
+
+        showPosts();
+
         if (loadable.isThreadMode()) {
             int postsSize = result.posts.size();
 
@@ -238,11 +244,6 @@ public class ThreadPresenter implements ChanLoader.ChanLoaderCallback, PostAdapt
             }
         }
 
-        if (isWatching()) {
-            chanLoader.setTimer();
-        }
-        showPosts();
-
         if (loadable.markedNo >= 0) {
             Post markedPost = findPostById(loadable.markedNo);
             if (markedPost != null) {
@@ -277,6 +278,7 @@ public class ThreadPresenter implements ChanLoader.ChanLoaderCallback, PostAdapt
         }
 
         threadPresenterCallback.showNewPostsNotification(false, -1);
+
         // Update the last seen indicator
         showPosts();
     }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
index 021f4f6c..4cbf8a6f 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
@@ -305,19 +305,7 @@ public class ThreadListLayout extends LinearLayout implements ReplyLayout.ReplyL
     }
 
     public boolean scrolledToBottom() {
-        switch (postViewMode) {
-            case LIST:
-                if (((LinearLayoutManager) layoutManager).findLastVisibleItemPosition() == postAdapter.getItemCount() - 1) {
-                    return true;
-                }
-                break;
-            case CARD:
-                if (((GridLayoutManager) layoutManager).findLastVisibleItemPosition() == postAdapter.getItemCount() - 1) {
-                    return true;
-                }
-                break;
-        }
-        return false;
+        return getCompleteBottomAdapterPosition() == postAdapter.getItemCount() - 1;
     }
 
     public void cleanup() {