diff --git a/material/partials/header.html b/material/partials/header.html
index e631fd5f1..361de5145 100644
--- a/material/partials/header.html
+++ b/material/partials/header.html
@@ -38,13 +38,11 @@
         {% endblock %}
       </div>
       <div class="md-flex__cell md-flex__cell--shrink">
-        {% block repo %}
-          {% if config.repo_url %}
-            <div class="md-header-nav__source">
-              {% include "partials/source.html" %}
-            </div>
-          {% endif %}
-        {% endblock %}
+        {% if config.repo_url %}
+          <div class="md-header-nav__source">
+            {% include "partials/source.html" %}
+          </div>
+        {% endif %}
       </div>
     </div>
   </nav>
diff --git a/material/partials/source.html b/material/partials/source.html
index 2c17bb71f..5dbaee2e6 100644
--- a/material/partials/source.html
+++ b/material/partials/source.html
@@ -9,15 +9,17 @@
 {% else %}
   {% set repo_type = "" %}
 {% endif %}
-<a href="{{ config.repo_url }}" title="{{ i18n.t('source.link.title') }}" class="md-source" data-md-source="{{ repo_type }}">
-  {% if repo_type %}
-    <div class="md-source__icon">
-      <svg viewBox="0 0 24 24" width="24" height="24">
-        <use xlink:href="#{{ repo_type }}" width="24" height="24"></use>
-      </svg>
+{% block repo %}
+  <a href="{{ config.repo_url }}" title="{{ i18n.t('source.link.title') }}" class="md-source" data-md-source="{{ repo_type }}">
+    {% if repo_type %}
+      <div class="md-source__icon">
+        <svg viewBox="0 0 24 24" width="24" height="24">
+          <use xlink:href="#{{ repo_type }}" width="24" height="24"></use>
+        </svg>
+      </div>
+    {% endif %}
+    <div class="md-source__repository">
+      {{ config.repo_name }}
     </div>
-  {% endif %}
-  <div class="md-source__repository">
-    {{ config.repo_name }}
-  </div>
-</a>
+  </a>
+{% endblock %}
diff --git a/src/partials/header.html b/src/partials/header.html
index b874153cc..db6947f04 100644
--- a/src/partials/header.html
+++ b/src/partials/header.html
@@ -79,13 +79,11 @@
 
       <!-- Repository containing source -->
       <div class="md-flex__cell md-flex__cell--shrink">
-        {% block repo %}
-          {% if config.repo_url %}
-            <div class="md-header-nav__source">
-              {% include "partials/source.html" %}
-            </div>
-          {% endif %}
-        {% endblock %}
+        {% if config.repo_url %}
+          <div class="md-header-nav__source">
+            {% include "partials/source.html" %}
+          </div>
+        {% endif %}
       </div>
     </div>
   </nav>
diff --git a/src/partials/source.html b/src/partials/source.html
index 1ed97c068..9c8273b9d 100644
--- a/src/partials/source.html
+++ b/src/partials/source.html
@@ -38,16 +38,18 @@
 {% endif %}
 
 <!-- Repository containing source -->
-<a href="{{ config.repo_url }}" title="{{ i18n.t('source.link.title') }}"
-    class="md-source" data-md-source="{{ repo_type }}">
-  {% if repo_type %}
-    <div class="md-source__icon">
-      <svg viewBox="0 0 24 24" width="24" height="24">
-        <use xlink:href="#{{ repo_type }}" width="24" height="24"></use>
-      </svg>
+{% block repo %}
+  <a href="{{ config.repo_url }}" title="{{ i18n.t('source.link.title') }}"
+      class="md-source" data-md-source="{{ repo_type }}">
+    {% if repo_type %}
+      <div class="md-source__icon">
+        <svg viewBox="0 0 24 24" width="24" height="24">
+          <use xlink:href="#{{ repo_type }}" width="24" height="24"></use>
+        </svg>
+      </div>
+    {% endif %}
+    <div class="md-source__repository">
+      {{ config.repo_name }}
     </div>
-  {% endif %}
-  <div class="md-source__repository">
-    {{ config.repo_name }}
-  </div>
-</a>
+  </a>
+{% endblock %}