diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js
index e8d57352cb..443f404cea 100644
--- a/public/src/modules/navigator.js
+++ b/public/src/modules/navigator.js
@@ -161,7 +161,8 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
 
 		var elTop = el.offset().top;
 		var elBottom = elTop + Math.floor(el.height());
-		return (elTop >= scrollTop && elBottom <= scrollBottom) || (elTop <= scrollTop && elBottom >= scrollTop);
+
+		return (elTop >= scrollTop && elBottom < scrollBottom) || (elTop < scrollTop && elBottom > scrollTop);
 	}
 
 	navigator.scrollToPost = function(postIndex, highlight, duration, offset) {
diff --git a/src/controllers/topics.js b/src/controllers/topics.js
index 4e2ade5868..9db26b8f4f 100644
--- a/src/controllers/topics.js
+++ b/src/controllers/topics.js
@@ -89,9 +89,9 @@ topicsController.get = function(req, res, next) {
 			}
 			if (!settings.usePagination) {
 				if (reverse) {
-					postIndex = Math.max(0, postCount - (req.params.post_index || postCount) - (settings.postsPerPage - 1));
+					postIndex = Math.max(0, postCount - (req.params.post_index || postCount) - (settings.postsPerPage / 2));
 				} else {
-					postIndex = Math.max(0, (req.params.post_index || 1) - (settings.postsPerPage + 1));
+					postIndex = Math.max(0, (req.params.post_index || 1) - (settings.postsPerPage / 2));
 				}
 			} else if (!req.query.page) {
 				var index = 0;