diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97e8f4ae4..a29c3defa 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,9 @@ The links to individual versions below are to copies of the script with the upda
 
 ## v1.10.0
 
+**v1.10.0.7** *(2015-02-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.7/builds/4chan-X-noupdate.crx "Chromium version")]
+- Work around more issues with clearing settings in Firefox 35+.
+
 **v1.10.0.6** *(2015-02-17)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.6/builds/4chan-X-noupdate.crx "Chromium version")]
 - Fix bugs when `Fixed Header` is off but `Bottom Header` is on.
 
diff --git a/src/General/lib/$.coffee b/src/General/lib/$.coffee
index 9bf3c5f58..e690c705b 100755
--- a/src/General/lib/$.coffee
+++ b/src/General/lib/$.coffee
@@ -482,16 +482,15 @@ $.set = do ->
     cb?()
 
 $.clear = (cb) ->
+  # XXX https://github.com/greasemonkey/greasemonkey/issues/2033
+  $.delete Object.keys(Conf)
+  $.delete ['previousversion', 'AutoWatch', 'cooldown.global', 'QR Size', 'captchas', 'QR.persona', 'hiddenPSA']
+  $.delete ("#{id}.position" for id in ['embedding', 'updater', 'thread-stats', 'thread-watcher', 'qr'])
+  boards = (a.textContent for a in $$ '#boardNavDesktop > .boardList > a')
+  boards.push 'qa'
+  $.delete ("cooldown.#{board}" for board in boards)
   try
     $.delete GM_listValues().map (key) -> key.replace g.NAMESPACE, ''
-  catch err
-    # XXX https://github.com/greasemonkey/greasemonkey/issues/2033
-    $.delete Object.keys(Conf)
-    $.delete ['previousversion', 'AutoWatch', 'cooldown.global', 'QR Size', 'captchas', 'QR.persona', 'hiddenPSA']
-    $.delete ("#{id}.position" for id in ['embedding', 'updater', 'thread-stats', 'thread-watcher', 'qr'])
-    boards = (a.textContent for a in $$ '#boardNavDesktop > .boardList > a')
-    boards.push 'qa'
-    $.delete ("cooldown.#{board}" for board in boards)
   cb?()
 <% } %>