diff --git a/core/client/init.js b/core/client/init.js
index b8ec9864e6..e0e987831c 100644
--- a/core/client/init.js
+++ b/core/client/init.js
@@ -73,4 +73,5 @@
 
     window.Ghost = Ghost;
 
+    window.addEventListener("load", Ghost.init, false);
 }());
diff --git a/core/server/views/default.hbs b/core/server/views/default.hbs
index 95d0de9609..2f0c8c5aef 100644
--- a/core/server/views/default.hbs
+++ b/core/server/views/default.hbs
@@ -56,9 +56,5 @@
     {{{ghostScriptTags}}}
 
     {{{block "bodyScripts"}}}
-
-    <script>
-        Ghost.init();
-    </script>
 </body>
 </html>