diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index a2a665607..c2fa2dccb 100644
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -74,7 +74,7 @@ Header =
       return unless Main.isThisPageLegit()
       # Wait for #boardNavMobile instead of #boardNavDesktop,
       # it might be incomplete otherwise.
-      $.asap (-> $.id('boardNavMobile') or d.readyState is 'complete'), Header.setBoardList
+      $.asap (-> $.id('boardNavMobile') or d.readyState in ['interactive', 'complete']), Header.setBoardList
       $.prepend d.body, headerEl
 
     $.ready ->
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index d91d27326..a9ac91c01 100644
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -18,7 +18,8 @@ Main =
     Conf['archives'] = Redirect.archives
     $.get Conf, Main.initFeatures
 
-    $.on d, '4chanMainInit', Main.initStyle
+    $.asap (-> d.head and $('link[rel="shortcut icon"]', d.head) or d.readyState in ['interactive', 'complete']),
+      Main.initStyle
 
   initFeatures: (items) ->
     Conf = items
@@ -118,7 +119,6 @@ Main =
     $.ready Main.initReady
 
   initStyle: ->
-    $.off d, '4chanMainInit', Main.initStyle
     return unless Main.isThisPageLegit()
     # disable the mobile layout
     $('link[href*=mobile]', d.head)?.disabled = true