diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss
index 7bd652432..08f439956 100644
--- a/app/assets/stylesheets/components/message.scss
+++ b/app/assets/stylesheets/components/message.scss
@@ -88,8 +88,8 @@
 
   margin-top: $gutter;
 
-  &.top-gutter-0 {
-    margin-top: 0;
+  &.top-gutter-5px {
+    margin-top: 5px;
   }
 
 }
diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index a5e9cca93..03956452b 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -21,7 +21,7 @@
     {% endif %}
   </p>
 {% else %}
-  <nav id="template-list" class="{{ 'top-gutter-0' if (not show_template_nav and not show_search_box) else '' }}">
+  <nav id="template-list" class="{{ 'top-gutter-5px' if (not show_template_nav and not show_search_box) else '' }}">
     {% for item in template_list %}
       <div class="template-list-item {% if current_user.has_permissions('manage_templates') %}template-list-item-with-checkbox{% endif %} {% if item.ancestors %}template-list-item-hidden-by-default{% endif %} {% if not item.ancestors %}template-list-item-without-ancestors{% endif %}">
         {% if current_user.has_permissions('manage_templates') %}