diff --git a/src/Miscellaneous/Keybinds.coffee b/src/Miscellaneous/Keybinds.coffee
index 4d540856a..4bb527170 100644
--- a/src/Miscellaneous/Keybinds.coffee
+++ b/src/Miscellaneous/Keybinds.coffee
@@ -92,9 +92,10 @@ Keybinds =
           else
             return
       when Conf['Watch']
-        return unless thread
+        return unless ThreadWatcher.enabled and thread
         ThreadWatcher.toggle thread
       when Conf['Update thread watcher']
+        return unless ThreadWatcher.enabled
         ThreadWatcher.buttonFetchAll()
       # Images
       when Conf['Expand image']
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 662094edb..39bb5b61d 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -1,6 +1,6 @@
 ThreadWatcher =
   init: ->
-    return if !Conf['Thread Watcher']
+    return unless (@enabled = Conf['Thread Watcher'])
 
     @shortcut = sc = $.el 'a',
       id:   'watcher-link'