diff --git a/src/Filtering/Filter.coffee b/src/Filtering/Filter.coffee
index b33da2edb..ec6e0e9c1 100755
--- a/src/Filtering/Filter.coffee
+++ b/src/Filtering/Filter.coffee
@@ -113,6 +113,7 @@ Filter =
 
         # Highlight
         $.addClass @nodes.root, result.class
+        @thread.highlight = result.class
         if !@isReply and result.top
           @thread.isOnTop = true
 
diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index 8720bd583..e6c4faf63 100755
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -363,6 +363,8 @@ Build =
       '<div class="comment">&{thread.OP.nodes.comment}</div>'
     ) %>
 
+    $.addClass root, thread.highlight if thread.highlight
+
     if thread.isSticky
       $.add $('.thread-icons', root), $.el 'img',
         src: "#{staticPath}sticky#{gifIcon}"
diff --git a/src/General/css/style.css b/src/General/css/style.css
index 4bd92933f..a74e37423 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -516,6 +516,7 @@ hr ~ div.center:not(.ad-cnt) {
 .thumb {
   max-width: 150px;
   max-height: 150px;
+  border-radius: 2px;
   box-shadow: 0 0 5px rgba(0, 0, 0, .25);
 }
 .thunb.spoiler-file {
@@ -823,6 +824,9 @@ span.hide-announcement {
 .filter-highlight > .reply {
   box-shadow: -5px 0 rgba(255, 0, 0, .5);
 }
+.filter-highlight .thumb {
+  border: 2px solid rgba(255, 0, 0, .5);
+}
 
 /* Spoiler text */
 :root.reveal-spoilers s {