diff --git a/public/src/client/category.js b/public/src/client/category.js
index fd757e7803..a91f32b03e 100644
--- a/public/src/client/category.js
+++ b/public/src/client/category.js
@@ -15,8 +15,8 @@ define('forum/category', [
 ], function (infinitescroll, share, navigator, categoryTools, sort, components, translator, topicSelect, pagination, storage) {
 	var Category = {};
 
-	$(window).on('action:ajaxify.end', function (ev, data) {
-		if (data.tpl_url !== 'category') {
+	$(window).on('action:ajaxify.start', function (ev, data) {
+		if (data.url && !data.url.startsWith('category/')) {
 			navigator.disable();
 
 			removeListeners();
diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index 3651c8be2b..08a707f029 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -23,16 +23,14 @@ define('forum/topic', [
 			Topic.replaceURLTimeout = 0;
 		}
 
-		if (ajaxify.currentPage !== data.url) {
+		if (data.url && !data.url.startsWith('topic/')) {
 			navigator.disable();
 			components.get('navbar/title').find('span').text('').hide();
 			app.removeAlert('bookmark');
 
 			events.removeListeners();
 			$(window).off('keydown', onKeyDown);
-		}
 
-		if (data.url && !data.url.startsWith('topic/')) {
 			require(['search'], function (search) {
 				if (search.topicDOM.active) {
 					search.topicDOM.end();