diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss
index b0469c917..d39d99c1e 100644
--- a/app/assets/stylesheets/components/message.scss
+++ b/app/assets/stylesheets/components/message.scss
@@ -52,6 +52,22 @@
       display: none;
     }
 
+    &-without-ancestors {
+
+      .message-name {
+
+        a {
+          display: block;
+
+          &:first-child {
+            display: block;
+          }
+        }
+
+      }
+
+    }
+
   }
 
   &-folder {
diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index a6e7fb212..f26e32b0d 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -12,7 +12,7 @@
 {% else %}
   <nav id=template-list>
     {% for item in template_list %}
-      <div class="template-list-item {% if can_manage_folders %}template-list-item-with-checkbox{% endif %} {% if item.ancestors %}template-list-item-hidden-by-default{% endif %}">
+      <div class="template-list-item {% if can_manage_folders %}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 can_manage_folders %}
           {{ unlabelled_checkbox(
             id='templates-or-folder-{}'.format(item.id),