diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index c9fb37bcf..df3fec058 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -11974,10 +11974,12 @@
       g.VIEW = view;
       switch (view) {
         case 'index':
+          delete g.THREADID;
           QR.link.textContent = 'Start a Thread';
           $.off(d, 'ThreadUpdate', QR.statusCheck);
-          return $.on(d, 'indexRefresh', QR.generatePostableThreadsList);
+          return $.on(d, 'IndexRefresh', QR.generatePostableThreadsList);
         case 'thread':
+          g.THREADID = +window.location.pathname.split('/')[3];
           QR.link.textContent = 'Reply to Thread';
           $.on(d, 'ThreadUpdate', QR.statusCheck);
           return $.off(d, 'IndexRefresh', QR.generatePostableThreadsList);
diff --git a/builds/crx/script.js b/builds/crx/script.js
index e3cfb332a..6354ae7c5 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -11963,10 +11963,12 @@
       g.VIEW = view;
       switch (view) {
         case 'index':
+          delete g.THREADID;
           QR.link.textContent = 'Start a Thread';
           $.off(d, 'ThreadUpdate', QR.statusCheck);
-          return $.on(d, 'indexRefresh', QR.generatePostableThreadsList);
+          return $.on(d, 'IndexRefresh', QR.generatePostableThreadsList);
         case 'thread':
+          g.THREADID = +window.location.pathname.split('/')[3];
           QR.link.textContent = 'Reply to Thread';
           $.on(d, 'ThreadUpdate', QR.statusCheck);
           return $.off(d, 'IndexRefresh', QR.generatePostableThreadsList);
diff --git a/src/General/Navigate.coffee b/src/General/Navigate.coffee
index c143519f5..7afc5702e 100644
--- a/src/General/Navigate.coffee
+++ b/src/General/Navigate.coffee
@@ -104,10 +104,12 @@ Navigate =
 
     switch view
       when 'index'
+        delete g.THREADID
         QR.link.textContent = 'Start a Thread'
         $.off d, 'ThreadUpdate', QR.statusCheck
-        $.on  d, 'indexRefresh', QR.generatePostableThreadsList
+        $.on  d, 'IndexRefresh', QR.generatePostableThreadsList
       when 'thread'
+        g.THREADID = +window.location.pathname.split('/')[3]
         QR.link.textContent = 'Reply to Thread'
         $.on  d, 'ThreadUpdate', QR.statusCheck
         $.off d, 'IndexRefresh', QR.generatePostableThreadsList
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 466a9f939..6f158edd9 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -655,8 +655,6 @@ QR =
 
     ThreadUpdater.postID = postID
 
-
-
     # Post/upload confirmed as successful.
     $.event 'QRPostSuccessful', {
       board: g.BOARD