diff --git a/CHANGELOG b/CHANGELOG
index c21c6bbc4..405ecaab8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ mkdocs-material-2.x.x (2017-xx-xx)
   * Added Russian translations
   * Fixed #542: Horizontal scrollbar between 1220px and 1234px
   * Fixed #553: Metadata values only rendering first character
+  * Fixed #558: Flash of unstyled content
   * Fixed favicon regression caused by deprecation upstream
 
 mkdocs-material-2.0.1 (2017-10-31)
diff --git a/material/base.html b/material/base.html
index c3ad85584..041b3b280 100644
--- a/material/base.html
+++ b/material/base.html
@@ -45,15 +45,15 @@
         <title>{{ config.site_name }}</title>
       {% endif %}
     {% endblock %}
-    {% block libs %}
-      <script src="{{ base_url }}/assets/javascripts/modernizr-e826f8942a.js"></script>
-    {% endblock %}
     {% block styles %}
       <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-5b1b46901f.css">
       {% if palette.primary or palette.accent %}
         <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-23f75ab9c7.palette.css">
       {% endif %}
     {% endblock %}
+    {% block libs %}
+      <script src="{{ base_url }}/assets/javascripts/modernizr-e826f8942a.js"></script>
+    {% endblock %}
     {% block fonts %}
       {% if font != false %}
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family={{
diff --git a/src/base.html b/src/base.html
index d691959d9..7f3ed7b6c 100644
--- a/src/base.html
+++ b/src/base.html
@@ -92,11 +92,6 @@
       {% endif %}
     {% endblock %}
 
-    <!-- JavaScript libraries -->
-    {% block libs %}
-      <script src="{{ base_url }}/assets/javascripts/modernizr.js"></script>
-    {% endblock %}
-
     <!-- Stylesheets -->
     {% block styles %}
 
@@ -111,6 +106,11 @@
       {% endif %}
     {% endblock %}
 
+    <!-- JavaScript libraries -->
+    {% block libs %}
+      <script src="{{ base_url }}/assets/javascripts/modernizr.js"></script>
+    {% endblock %}
+
     <!-- Webfonts -->
     {% block fonts %}
       {% if font != false %}