diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index 43a64a9fa3..cce6f1f99a 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -202,7 +202,7 @@ define('forum/topic', [
 					$('[component="topic/thumb/select"]').removeClass('border-primary');
 					$(this).addClass('border-primary');
 					$('[component="topic/thumb/current"]')
-						.attr('src', $(this).attr('src'));
+						.attr('src', $(this).find('img').attr('src'));
 				});
 			}
 		});
diff --git a/src/views/modals/topic-thumbs-view.tpl b/src/views/modals/topic-thumbs-view.tpl
index 9603e9bc36..a0ee682f80 100644
--- a/src/views/modals/topic-thumbs-view.tpl
+++ b/src/views/modals/topic-thumbs-view.tpl
@@ -1,14 +1,14 @@
 <div class="d-flex flex-column gap-4 topic-thumbs-view-modal">
 	<div class="d-flex justify-content-center align-items-center mb-5" style="height: 33vh; max-height: 33vh;">
-		<img component="topic/thumb/current" src="{src}" style="max-height: 33vh; max-width:100%;" />
+		<img component="topic/thumb/current" class="rounded" src="{src}" style="max-height: 33vh; max-width:100%;" />
 	</div>
 	{{{ if (thumbs.length != "1") }}}
 	<hr/>
 	<div class="d-flex justify-content-center mb-3 gap-3 flex-wrap">
 	{{{ each thumbs }}}
-		<div>
-			<img component="topic/thumb/select" class="pointer rounded p-1 border border-3 {{{ if ./selected }}}border-primary{{{ end }}}" height="64px" style="width: auto;" src="{./url}"/>
-		</div>
+		<a href="#" component="topic/thumb/select" class="p-1 rounded-3 border border-3 {{{ if ./selected }}}border-primary{{{ end }}}">
+			<img class="rounded-2" height="64px" style="width: auto;" src="{./url}"/>
+		</a>
 	{{{ end }}}
 	</div>
 	{{{ end }}}