diff --git a/4chan_x.user.js b/4chan_x.user.js
index 62eaed735..74dd89b69 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -607,7 +607,7 @@
           $.addClass(root, result[0]);
           if (isOP && result[1] && !g.REPLY) {
             thisThread = root.parentNode;
-            if (firstThread = $('div[class=thread]')) {
+            if (firstThread = $('div[class="postContainer opContainer"]').parentNode) {
               $.before(firstThread, [thisThread, thisThread.nextElementSibling]);
             }
           }
diff --git a/script.coffee b/script.coffee
index 91f5436d4..3e7e135c0 100644
--- a/script.coffee
+++ b/script.coffee
@@ -486,7 +486,7 @@ Filter =
           # Put the highlighted OPs' thread on top of the board page...
           thisThread = root.parentNode
           # ...before the first non highlighted thread.
-          if firstThread = $ 'div[class=thread]'
+          if firstThread = $('div[class="postContainer opContainer"]').parentNode
             $.before firstThread, [thisThread, thisThread.nextElementSibling]
 
   name: (post) ->