diff --git a/4chan_x.user.js b/4chan_x.user.js
index 50624da87..1d52f642d 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -964,7 +964,7 @@
         thread.nextElementSibling.hidden = true;
         return;
       }
-      if (thread.firstChild.className === 'block') {
+      if (thread.firstChild.className === 'hide_thread_button hidden_thread') {
         return;
       }
       num = 0;
@@ -4229,11 +4229,12 @@ a[href="javascript:;"] {\
   color: red;\
 }\
 \
-.hide_thread_button {\
+.hide_thread_button:not(.hidden_thread) {\
   float: left;\
 }\
 \
 .hidden_thread ~ *,\
+.hidden_thread + div.opContainer,\
 [hidden],\
 #content > [name=tab]:not(:checked) + div,\
 #updater:not(:hover) > :not(.move),\
diff --git a/script.coffee b/script.coffee
index 3bfdb6e1c..f75ff17d7 100644
--- a/script.coffee
+++ b/script.coffee
@@ -749,7 +749,7 @@ ThreadHiding =
       thread.nextElementSibling.hidden = true
       return
 
-    return if thread.firstChild.className is 'block' # already hidden by filter
+    return if thread.firstChild.className is 'hide_thread_button hidden_thread' # already hidden by filter
 
     num     = 0
     if span = $ '.summary', thread
@@ -3238,11 +3238,12 @@ a[href="javascript:;"] {
   color: red;
 }
 
-.hide_thread_button {
+.hide_thread_button:not(.hidden_thread) {
   float: left;
 }
 
 .hidden_thread ~ *,
+.hidden_thread + div.opContainer,
 [hidden],
 #content > [name=tab]:not(:checked) + div,
 #updater:not(:hover) > :not(.move),