diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index 5ee1f91f60..bdebc50264 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -206,6 +206,12 @@ define('forum/topic', [
 				});
 			}
 		});
+
+		$('[component="topic/thumb/list/expand"]').on('click', function () {
+			const btn = $(this);
+			btn.parents('[component="topic/thumb/list"]').removeClass('thumbs-collapsed');
+			btn.remove();
+		});
 	}
 
 	function addBlockQuoteHandler() {
diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js
index 896d0b485b..6df32ea76e 100644
--- a/public/src/modules/helpers.common.js
+++ b/public/src/modules/helpers.common.js
@@ -25,6 +25,8 @@ module.exports = function (utils, Benchpress, relative_path) {
 		userAgentIcons,
 		buildAvatar,
 		increment,
+		lessthan,
+		greaterthan,
 		generateWroteReplied,
 		generateRepliedTo,
 		generateWrote,
@@ -328,6 +330,14 @@ module.exports = function (utils, Benchpress, relative_path) {
 		return String(value + parseInt(inc, 10));
 	}
 
+	function lessthan(a, b) {
+		return parseInt(a, 10) < parseInt(b, 10);
+	}
+
+	function greaterthan(a, b) {
+		return parseInt(a, 10) > parseInt(b, 10);
+	}
+
 	function generateWroteReplied(post, timeagoCutoff) {
 		if (post.toPid) {
 			return generateRepliedTo(post, timeagoCutoff);