diff --git a/app/index.html b/app/index.html
index 37dc05a..c2635b4 100644
--- a/app/index.html
+++ b/app/index.html
@@ -13,6 +13,12 @@
     <link rel="stylesheet" href="{{rootURL}}assets/kredits-web.css">
 
     {{content-for "head-footer"}}
+
+    <script>
+      window.addEventListener('load', function() {
+        window.windowLoadComplete = true;
+      });
+    </script>
   </head>
   <body>
     {{content-for "body"}}
diff --git a/app/initializers/defer-loading.js b/app/initializers/defer-loading.js
index c6e8c28..6cd1b14 100644
--- a/app/initializers/defer-loading.js
+++ b/app/initializers/defer-loading.js
@@ -6,9 +6,14 @@
 export default {
   name: 'defer-loading',
   initialize: function(application) {
+    // Load event already fired, so web3 should be loaded if available
+    if (window.windowLoadComplete) { return true; }
+
+    // Pause app loading
     application.deferReadiness();
 
     window.addEventListener('load', function() {
+      // Continue app loading
       application.advanceReadiness();
     });
   }
