diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index c5be0938c6..43190850da 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -61,11 +61,11 @@ $(document).ready(function() {
 			});
 		});
 
-		if (!quiet) {
-			require(['search'], function(search) {
+		require(['search'], function(search) {
+			if (search.topicDOM.active && !url.startsWith('topic/')) {
 				search.topicDOM.end();
-			});
-		}
+			}
+		});
 
 		return true;
 	};
diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js
index add1b41b04..e8d57352cb 100644
--- a/public/src/modules/navigator.js
+++ b/public/src/modules/navigator.js
@@ -191,7 +191,7 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
 		} else {
 			navigator.scrollActive = false;
 			postIndex = parseInt(postIndex, 10) + 1;
-			ajaxify.go(generateUrl(postIndex), undefined, true);
+			ajaxify.go(generateUrl(postIndex));
 		}
 	};