diff --git a/4chan_x.user.js b/4chan_x.user.js
index 33a7c1d07..bc39c2c55 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -2795,6 +2795,13 @@
       $.addStyle(main.css);
       if ((form = $('form[name=post]')) && (canPost = !!$('#recaptcha_response_field'))) {
         Recaptcha.init();
+        if (g.REPLY && conf['Auto Watch Reply'] && conf['Thread Watcher']) {
+          $.bind(form, 'submit', function() {
+            if ($('img.favicon').src === Favicon.empty) {
+              return watcher.watch(null, g.THREAD_ID);
+            }
+          });
+        }
       }
       threading.init();
       if (g.REPLY && (id = location.hash.slice(1)) && /\d/.test(id[0]) && !$.id(id)) {
diff --git a/script.coffee b/script.coffee
index b9de6f0aa..2784b2692 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2205,6 +2205,9 @@ main =
     #recaptcha may be blocked, eg by noscript
     if (form = $ 'form[name=post]') and (canPost = !!$ '#recaptcha_response_field')
       Recaptcha.init()
+      if g.REPLY and conf['Auto Watch Reply'] and conf['Thread Watcher']
+        $.bind form, 'submit', -> if $('img.favicon').src is Favicon.empty
+            watcher.watch null, g.THREAD_ID
 
     #major features
     threading.init()