diff --git a/src/core/init.js b/src/core/init.js
index 5eafd2b72b..9bf5672829 100644
--- a/src/core/init.js
+++ b/src/core/init.js
@@ -31,10 +31,10 @@ var _globalInit = function() {
 // TODO: ???
 
 // if the page is ready, initialize p5 immediately
-if (document.readyState === 'complete') {
+if (document.readyState !== 'loading') {
   _globalInit();
   // if the page is still loading, add an event listener
   // and initialize p5 as soon as it finishes loading
 } else {
-  window.addEventListener('load', _globalInit, false);
+  document.addEventListener('DOMContentLoaded', _globalInit, false);
 }
diff --git a/src/core/main.js b/src/core/main.js
index d36d81caeb..39e72e3f07 100644
--- a/src/core/main.js
+++ b/src/core/main.js
@@ -552,10 +552,14 @@ var p5 = function(sketch, node, sync) {
   if (sync) {
     this._start();
   } else {
-    if (document.readyState === 'complete') {
+    if (document.readyState !== 'loading') {
       this._start();
     } else {
-      window.addEventListener('load', this._start.bind(this), false);
+      document.addEventListener(
+        'DOMContentLoaded',
+        this._start.bind(this),
+        false
+      );
     }
   }
 };