diff --git a/src/General/Navigate.coffee b/src/General/Navigate.coffee
index 892363c28..d57790483 100644
--- a/src/General/Navigate.coffee
+++ b/src/General/Navigate.coffee
@@ -156,6 +156,7 @@ Navigate =
     return if e and (e.shiftKey or e.ctrlKey or (e.type is 'click' and e.button isnt 0)) # Not simply a left click
 
     $.addClass Index.button, 'fa-spin'
+    Index.clearSearch() if Index.isSearching
 
     [_, boardID, view, threadID] = @pathname.split '/'
 
diff --git a/src/General/lib/simpledict.class b/src/General/lib/simpledict.class
index 48baac2af..6ce13dfa9 100644
--- a/src/General/lib/simpledict.class
+++ b/src/General/lib/simpledict.class
@@ -13,4 +13,7 @@ class SimpleDict
       @keys.splice i, 1
       delete @[key]
 
-  forEach: (fn) -> fn @[key] for key in [@keys...]
+  forEach: (fn) -> 
+    fn @[key] for key in [@keys...]
+    return
+