diff --git a/omega/js/omega-mediaqueries.js b/omega/js/omega-mediaqueries.js
index 05d0cdd..bf3c3f1 100644
--- a/omega/js/omega-mediaqueries.js
+++ b/omega/js/omega-mediaqueries.js
@@ -89,25 +89,34 @@ Drupal.omega = Drupal.omega || {};
   /**
    * @todo
    */
-  Drupal.behaviors.omegaMediaQueries = {
-    attach: function (context) {
-      $('body', context).once('omega-mediaqueries', function () {
-        var primary = $.inArray(Drupal.settings.omega.layouts.primary, Drupal.settings.omega.layouts.order);
-        var dummy = $('<div id="omega-media-query-dummy"></div>').prependTo('body');
+  $(document).ready(function(){
 
-        dummy.append('<style media="all">#omega-media-query-dummy { position: relative; z-index: -1; }</style>');
-        dummy.append('<!--[if (lt IE 9)&(!IEMobile)]><style media="all">#omega-media-query-dummy { z-index: ' + primary + '; }</style><![endif]-->');
+    $('body').once('omega-mediaqueries', function () {
 
-        for (var i in Drupal.settings.omega.layouts.order) {
-          dummy.append('<style media="' + Drupal.settings.omega.layouts.queries[Drupal.settings.omega.layouts.order[i]] + '">#omega-media-query-dummy { z-index: ' + i + '; }</style>');
-        }
+      var primary = $.inArray(Drupal.settings.omega.layouts.primary, Drupal.settings.omega.layouts.order);
+      var dummy = $('<div id="omega-media-query-dummy"></div>').prependTo('body');
+
+      dummy.append('<style media="all">#omega-media-query-dummy { position: relative; z-index: -1; }</style>');
+      dummy.append('<!--[if (lt IE 9)&(!IEMobile)]><style media="all">#omega-media-query-dummy { z-index: ' + primary + '; }</style><![endif]-->');
+
+      for (var i in Drupal.settings.omega.layouts.order) {
+        dummy.append('<style media="' + Drupal.settings.omega.layouts.queries[Drupal.settings.omega.layouts.order[i]] + '">#omega-media-query-dummy { z-index: ' + i + '; }</style>');
+      }
 
-        $(window).bind('resize.omegamediaqueries', function () {
+      $(window).bind('resize.omegamediaqueries', function () {
+        if (Drupal.omega.crappyBrowser(8)) {
+          // IE 7 always returns -1 for the z-index even if it's 0
+          setCurrentLayout(0);
+        }
+        else {
           setCurrentLayout(dummy.css('z-index'));
-        }).load(function () {
-          $(this).trigger('resize.omegamediaqueries');
-        });
+        }
       });
-    }
-  };
+
+      $(window).trigger('resize.omegamediaqueries');
+
+    });
+
+  });
+
 })(jQuery);