diff --git a/src/css/style.css b/src/css/style.css
index 3a598e0ab..28776bce7 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -1303,13 +1303,15 @@ input[name="Default Volume"] {
   display: block;
   clear: both;
 }
-.filter-highlight .catalog-thumb,
-.filter-highlight .werkTyme-filename {
+.catalog-thread.filter-highlight .catalog-thumb,
+:root.werkTyme .catalog-thread.filter-highlight:not(:hover),
+:root.werkTyme .catalog-thread.filter-highlight > .catalog-postContainer:hover > .catalog-post {
   box-shadow: 0 0 3px 3px rgba(255, 0, 0, .5);
 }
 .catalog-thread.watched .catalog-thumb,
-.catalog-thread.watched .werkTyme-filename {
-  border: 2px solid rgba(255, 0, 0, .75);
+:root.werkTyme .catalog-thread.watched:not(:hover),
+:root.werkTyme .catalog-thread.watched > .catalog-postContainer:hover > .catalog-post {
+  outline: 2px solid rgba(255, 0, 0, .75);
 }
 
 /* Spoiler text */
diff --git a/src/css/tomorrow.css b/src/css/tomorrow.css
index 0564327df..9448f5f6f 100644
--- a/src/css/tomorrow.css
+++ b/src/css/tomorrow.css
@@ -80,15 +80,18 @@
 :root.tomorrow .filter-highlight > div.sideArrows {
   color: rgb(155, 185, 210);
 }
-:root.tomorrow .filter-highlight .catalog-thumb,
-:root.tomorrow .filter-highlight .werkTyme-filename {
+:root.tomorrow .catalog-thread.filter-highlight .catalog-thumb,
+:root.tomorrow.werkTyme .catalog-thread.filter-highlight:not(:hover),
+:root.tomorrow.werkTyme .catalog-thread.filter-highlight > .catalog-postContainer:hover > .catalog-post {
   box-shadow: 0 0 3px 3px rgba(64, 192, 255, .7);
 }
 :root.tomorrow .catalog-thread.watched .catalog-thumb,
-:root.tomorrow .catalog-thread.watched .werkTyme-filename {
-  border: 2px solid rgb(64, 192, 255);
+:root.tomorrow.werkTyme .catalog-thread.watched:not(:hover),
+:root.tomorrow.werkTyme .catalog-thread.watched > .catalog-postContainer:hover > .catalog-post {
+  outline: 2px solid rgb(64, 192, 255);
 }
 
+
 /* QR */
 .tomorrow #dump-list::-webkit-scrollbar-thumb {
   background-color: #282A2E;