diff --git a/src/main/Main.coffee b/src/main/Main.coffee
index 2408a40b9..840028fda 100644
--- a/src/main/Main.coffee
+++ b/src/main/Main.coffee
@@ -84,6 +84,16 @@ Main =
         return
       $.asap docSet, ->
 
+        # XXX https://github.com/greasemonkey/greasemonkey/issues/2600
+        if typeof items.watchedThreads is 'string'
+          changes = {}
+          for key, val of items when typeof val is 'string'
+            try
+              val2 = JSON.parse val
+              changes[key] = val2
+          $.extend items, changes
+          $.set changes
+
         # Don't hide the local storage warning behind a settings panel.
         if $.cantSet
           # pass