diff --git a/4chan_x.user.js b/4chan_x.user.js
index 84d52e679..667a31af2 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -2790,7 +2790,7 @@
         if (conf['Reply Navigation']) {
           nav.init();
         }
-        if (conf['Auto Watch'] && conf['Thread Watcher'] && location.hash === '#watch' && $('img.favicon').src === Favicon.empty) {
+        if (conf['Auto Watch'] && conf['Thread Watcher'] && /watch/.test(location.search && $('img.favicon').src === Favicon.empty)) {
           watcher.watch(null, g.THREAD_ID);
         }
       } else {
diff --git a/script.coffee b/script.coffee
index 95ae25595..184de7fc3 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2184,7 +2184,7 @@ main =
         nav.init()
 
       if conf['Auto Watch'] and conf['Thread Watcher'] and
-        location.hash is '#watch' and $('img.favicon').src is Favicon.empty
+        /watch/.test location.search and $('img.favicon').src is Favicon.empty
           watcher.watch null, g.THREAD_ID
 
     else #not reply