diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss
index 4e4053db4..9bfd2e46f 100644
--- a/app/assets/stylesheets/app.scss
+++ b/app/assets/stylesheets/app.scss
@@ -79,16 +79,6 @@ a {
     word-wrap: break-word;
   }
 
-  > .grid-row:first-child  {
-
-    .heading-large,
-    .heading-medium {
-      margin: $gutter-half 0 $gutter-half 0;
-      word-wrap: break-word;
-    }
-
-  }
-
 }
 
 .highlight {
diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss
index c8da629d7..7923f28ef 100644
--- a/app/assets/stylesheets/components/message.scss
+++ b/app/assets/stylesheets/components/message.scss
@@ -46,7 +46,13 @@
 }
 
 #template-list {
+
   margin-top: $gutter;
+
+  &.top-gutter-0 {
+    margin-top: 0;
+  }
+
 }
 
 .template-list {
@@ -151,6 +157,11 @@
 
 .folder-heading {
 
+  .grid-row & {
+    margin: $gutter-half 0 20px 0;
+    word-wrap: break-word;
+  }
+
   a,
   &-folder,
   &-subfolder {
diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index f09ceca63..b2df718aa 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -10,7 +10,7 @@
     {% endif %}
   </p>
 {% else %}
-  <nav id=template-list>
+  <nav id="template-list" class="{{ 'top-gutter-0' 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') %}