diff --git a/CHANGELOG b/CHANGELOG
index d0eaf3d..74659a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Set document.loaded = true before firing dom:loaded custom event. (Andrew Dupont)
+
 * Allow Element#store to accept an object containing several key/value pairs. (ZenCocoon, Andrew Dupont)
 
 * Change Element#retrieve to return the element itself (for chaining). (Andrew Dupont)
diff --git a/src/dom/event.js b/src/dom/event.js
index 86da978..29b5a29 100644
--- a/src/dom/event.js
+++ b/src/dom/event.js
@@ -380,8 +380,8 @@
     if (document.loaded) return;
     if (_timer) window.clearInterval(_timer);
     
-    document.fire("dom:loaded");
     document.loaded = true;
+    document.fire("dom:loaded");
   }
   
   function _webkitContentLoadedCheck() {