diff --git a/4chan_x.user.js b/4chan_x.user.js
index f7516ad07..947b129da 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -2278,7 +2278,7 @@
     },
     toggle: function(thread) {
       var id;
-      id = $('.op', thread).id;
+      id = $('.favicon + input', thread).name;
       return watcher.watch(id) || watcher.unwatch(id, g.BOARD);
     },
     unwatch: function(id, board) {
diff --git a/script.coffee b/script.coffee
index dd4f6e276..b58c338c6 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1810,7 +1810,7 @@ watcher =
       watcher.unwatch thread[3], thread[1]
 
   toggle: (thread) ->
-    id = $('.op', thread).id
+    id = $('.favicon + input', thread).name
     watcher.watch(id) or watcher.unwatch id, g.BOARD
 
   unwatch: (id, board) ->