diff --git a/4chan_x.user.js b/4chan_x.user.js
index 527c68c6f..b4696b7a3 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1412,12 +1412,11 @@
         sage = /sage/.test(search);
         watch = /watch/.test(search);
         url = "http://boards.4chan.org/" + g.BOARD;
-        if (noko) {
+        if (watch && thread === '0') {
+          url += "/res/" + id + "?watch";
+        } else if (noko) {
           url += '/res/';
-          url += thread === 0 ? id : thread;
-          if (watch) {
-            url += '?watch';
-          }
+          url += thread === '0' ? id : thread;
         }
         if (cooldown) {
           duration = Date.now() + (sage ? 60 : 30) * 1000;
diff --git a/script.coffee b/script.coffee
index 97e68700d..d4ed358ec 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1138,11 +1138,11 @@ qr =
 
       url = "http://boards.4chan.org/#{g.BOARD}"
 
-      if noko
+      if watch and thread is '0'
+        url += "/res/#{id}?watch"
+      else if noko
         url += '/res/'
-        url += if thread is 0 then id else thread
-        if watch
-          url += '?watch'
+        url += if thread is '0' then id else thread
       if cooldown
         duration = Date.now() + (if sage then 60 else 30) * 1000
         url += '?cooldown=' + duration