diff --git a/website/templates/includes/footer.html b/website/templates/includes/footer.html
index 35459f417b..1cbd279bc4 100644
--- a/website/templates/includes/footer.html
+++ b/website/templates/includes/footer.html
@@ -1,4 +1,3 @@
-{% if top_bar_items %}
 <footer class="container">
 	<div class="web-footer row">
 	<div class="col-md-12">
@@ -44,5 +43,4 @@
 		</div>
 	</div>
 	</div>
-</footer>
-{% endif %}
\ No newline at end of file
+</footer>
\ No newline at end of file
diff --git a/website/templates/includes/navbar.html b/website/templates/includes/navbar.html
index 4526c2fdd6..e5ced182d0 100644
--- a/website/templates/includes/navbar.html
+++ b/website/templates/includes/navbar.html
@@ -1,4 +1,3 @@
-{% if top_bar_items %}
 <div class="navbar navbar-default">
 	<div class="container">
 		<div class="navbar-header">
@@ -11,6 +10,7 @@
 			<a class="navbar-brand" href="index">{{ brand_html or "<i class='icon-home'></i>"}}</a>
 		</div>
 		<div class="collapse navbar-collapse navbar-responsive-collapse">
+			{% if top_bar_items -%}
 			<ul class="nav navbar-nav navbar-left">
 				{%- for page in top_bar_items -%}
 				{% if not page.parent_label -%}
@@ -35,6 +35,7 @@
 				{%- endif -%}
 				{%- endfor %}
 			</ul>
+			{%- endif %}
 			<ul class="nav navbar-nav navbar-right">
 				<!-- post login tools -->
 				<li id="website-post-login" data-label="website-post-login" class="dropdown">
@@ -59,5 +60,4 @@
 		</div>
 	</div>
 </div>
-<script>$('.dropdown-toggle').dropdown()</script>
-{% endif %}
\ No newline at end of file
+<script>$('.dropdown-toggle').dropdown()</script>
\ No newline at end of file