diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index b18b5b48e..43ba1eb41 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -14980,9 +14980,11 @@
         var entry, input;
         entry = {
           type: 'thread watcher',
-          el: UI.checkbox(name, " " + (name.replace(' Thread Watcher', '')))
+          el: UI.checkbox(name, name.replace(' Thread Watcher', ''))
         };
+        entry.el.title = desc;
         input = entry.el.firstElementChild;
+        $.on(input, 'change', $.cb.checked);
         if (name === 'Current Board' || name === 'Show Unread Count') {
           $.on(input, 'change', ThreadWatcher.refresh);
         }
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 74765820c..2e4053f3a 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -15003,9 +15003,11 @@
         var entry, input;
         entry = {
           type: 'thread watcher',
-          el: UI.checkbox(name, " " + (name.replace(' Thread Watcher', '')))
+          el: UI.checkbox(name, name.replace(' Thread Watcher', ''))
         };
+        entry.el.title = desc;
         input = entry.el.firstElementChild;
+        $.on(input, 'change', $.cb.checked);
         if (name === 'Current Board' || name === 'Show Unread Count') {
           $.on(input, 'change', ThreadWatcher.refresh);
         }
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 57f4f75f6..07daaeab3 100755
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -430,8 +430,10 @@ ThreadWatcher =
     createSubEntry: (name, desc) ->
       entry =
         type: 'thread watcher'
-        el: UI.checkbox name, " #{name.replace ' Thread Watcher', ''}"
+        el: UI.checkbox name, name.replace(' Thread Watcher', '')
+      entry.el.title = desc
       input = entry.el.firstElementChild
+      $.on input, 'change', $.cb.checked
       $.on input, 'change', ThreadWatcher.refresh   if name in ['Current Board', 'Show Unread Count']
       $.on input, 'change', ThreadWatcher.fetchAuto if name in ['Show Unread Count', 'Auto Update Thread Watcher']
       entry