diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index e80be5e14..9aef30f6d 100755
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -329,9 +329,9 @@ Build =
       imgClass = 'no-file'
 
     thumb = if imgClass
-      <%= html('<img src="${src}" class="${imgClass}">') %>
+      <%= html('<img src="${src}" class="thumb ${imgClass}">') %>
     else
-      <%= html('<img src="${src}" width="${imgWidth}" height="${imgHeight}">') %>
+      <%= html('<img src="${src}" class="thumb" width="${imgWidth}" height="${imgHeight}">') %>
 
     postCount = data.replies + 1
     fileCount = data.images  + !!data.ext
@@ -345,7 +345,7 @@ Build =
     root = $.el 'div',
       className: 'catalog-thread'
     $.extend root, <%= html(
-      '<a href="/${thread.board}/thread/${thread.ID}" class="thumb">' +
+      '<a href="/${thread.board}/thread/${thread.ID}">' +
         '&{thumb}' +
       '</a>' +
       '<div class="thread-stats" title="Post count / File count / Page count">' +
diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 5ec05e24c..3b4c0334c 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -185,7 +185,7 @@ Index =
     $.on @nodes.thumb, 'click', Index.onClick
   onClick: (e) ->
     return if e.button isnt 0
-    thread = g.threads[@parentNode.dataset.fullID]
+    thread = g.threads[@parentNode.parentNode.dataset.fullID]
     if e.shiftKey
       Index.toggleHide thread
     else if e.altKey
diff --git a/src/General/css/style.css b/src/General/css/style.css
index 7f9a521cf..1e80fd7f1 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -516,30 +516,30 @@ hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) {
   word-break: break-word;
   vertical-align: top;
 }
-.thumb {
+.catalog-thread > a {
   flex-shrink: 0;
   position: relative;
 }
-.thumb > img {
+.thumb {
   max-width: 150px;
   max-height: 150px;
   border-radius: 2px;
   box-shadow: 0 0 5px rgba(0, 0, 0, .25);
 }
-.thumb:not(.deleted-file):not(.no-file) > img {
+.thumb:not(.deleted-file):not(.no-file) {
   min-width: 30px;
   min-height: 30px;
 }
-.thumb.spoiler-file > img {
+.thumb.spoiler-file {
   width: 100px;
   height: 100px;
 }
-.thumb.deleted-file > img {
+.thumb.deleted-file {
   width: 127px;
   height: 13px;
   padding: 20px 11px;
 }
-.thumb.no-file > img {
+.thumb.no-file {
   width: 77px;
   height: 13px;
   padding: 20px 36px;
@@ -861,8 +861,8 @@ span.hide-announcement {
 .filter-highlight > .reply {
   box-shadow: -5px 0 rgba(255, 0, 0, .5);
 }
-.pinned .thumb > img,
-.filter-highlight .thumb > img {
+.pinned .thumb,
+.filter-highlight .thumb {
   border: 2px solid rgba(255, 0, 0, .5);
 }