diff --git a/builds/appchan-x.js b/builds/appchan-x.js
index c68e35f41..d8da9312a 100644
--- a/builds/appchan-x.js
+++ b/builds/appchan-x.js
@@ -9424,27 +9424,16 @@
 
   ThreadWatcher = {
     init: function() {
-      var sc;
-
       if (!Conf['Thread Watcher']) {
         return;
       }
-      this.shortcut = sc = $.el('a', {
-        textContent: 'Watcher',
-        id: 'watcher-link',
-        href: 'javascript:;',
-        className: 'disabled'
-      });
       this.dialog = UI.dialog('watcher', 'top: 50px; left: 0px;', '<div class=move>Thread Watcher<a class=close href=javascript:;>×</a></div>');
       $.on(d, 'QRPostSuccessful', this.cb.post);
       $.sync('WatchedThreads', this.refresh);
-      $.on(sc, 'click', this.toggleWatcher);
       $.on($('.move>.close', ThreadWatcher.dialog), 'click', this.toggleWatcher);
-      Header.addShortcut(sc);
       $.ready(function() {
         ThreadWatcher.refresh();
-        $.add(d.body, ThreadWatcher.dialog);
-        return ThreadWatcher.dialog.hidden = true;
+        return $.add(d.body, ThreadWatcher.dialog);
       });
       return Thread.prototype.callbacks.push({
         name: 'Thread Watcher',
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index cb1e016ba..12cb66527 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -9445,27 +9445,16 @@
 
   ThreadWatcher = {
     init: function() {
-      var sc;
-
       if (!Conf['Thread Watcher']) {
         return;
       }
-      this.shortcut = sc = $.el('a', {
-        textContent: 'Watcher',
-        id: 'watcher-link',
-        href: 'javascript:;',
-        className: 'disabled'
-      });
       this.dialog = UI.dialog('watcher', 'top: 50px; left: 0px;', '<div class=move>Thread Watcher<a class=close href=javascript:;>×</a></div>');
       $.on(d, 'QRPostSuccessful', this.cb.post);
       $.sync('WatchedThreads', this.refresh);
-      $.on(sc, 'click', this.toggleWatcher);
       $.on($('.move>.close', ThreadWatcher.dialog), 'click', this.toggleWatcher);
-      Header.addShortcut(sc);
       $.ready(function() {
         ThreadWatcher.refresh();
-        $.add(d.body, ThreadWatcher.dialog);
-        return ThreadWatcher.dialog.hidden = true;
+        return $.add(d.body, ThreadWatcher.dialog);
       });
       return Thread.prototype.callbacks.push({
         name: 'Thread Watcher',
diff --git a/builds/crx/script.js b/builds/crx/script.js
index b1932ed11..2c14a9ebb 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -9423,27 +9423,16 @@
 
   ThreadWatcher = {
     init: function() {
-      var sc;
-
       if (!Conf['Thread Watcher']) {
         return;
       }
-      this.shortcut = sc = $.el('a', {
-        textContent: 'Watcher',
-        id: 'watcher-link',
-        href: 'javascript:;',
-        className: 'disabled'
-      });
       this.dialog = UI.dialog('watcher', 'top: 50px; left: 0px;', '<div class=move>Thread Watcher<a class=close href=javascript:;>×</a></div>');
       $.on(d, 'QRPostSuccessful', this.cb.post);
       $.sync('WatchedThreads', this.refresh);
-      $.on(sc, 'click', this.toggleWatcher);
       $.on($('.move>.close', ThreadWatcher.dialog), 'click', this.toggleWatcher);
-      Header.addShortcut(sc);
       $.ready(function() {
         ThreadWatcher.refresh();
-        $.add(d.body, ThreadWatcher.dialog);
-        return ThreadWatcher.dialog.hidden = true;
+        return $.add(d.body, ThreadWatcher.dialog);
       });
       return Thread.prototype.callbacks.push({
         name: 'Thread Watcher',
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index e5b26f40f..2a613dcbb 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -1,26 +1,17 @@
 ThreadWatcher =
   init: ->
     return unless Conf['Thread Watcher']
-    @shortcut = sc = $.el 'a',
-      textContent: 'Watcher'
-      id:   'watcher-link'
-      href: 'javascript:;'
-      className: 'disabled'
 
     @dialog = UI.dialog 'watcher', 'top: 50px; left: 0px;',
       '<div class=move>Thread Watcher<a class=close href=javascript:;>×</a></div>'
 
     $.on d, 'QRPostSuccessful',   @cb.post
     $.sync  'WatchedThreads',     @refresh
-    $.on sc, 'click', @toggleWatcher
     $.on $('.move>.close', ThreadWatcher.dialog), 'click', @toggleWatcher
-    
-    Header.addShortcut sc
 
     $.ready ->
       ThreadWatcher.refresh()
       $.add d.body, ThreadWatcher.dialog
-      ThreadWatcher.dialog.hidden = true
 
     Thread::callbacks.push
       name: 'Thread Watcher'