diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss
index 2e9b52180..7b46c6cd3 100644
--- a/app/assets/stylesheets/components/message.scss
+++ b/app/assets/stylesheets/components/message.scss
@@ -67,7 +67,7 @@
   white-space: nowrap;
 
 
-  a,
+  a:first-child,
   &-folder {
 
     display: inline-block;
@@ -81,10 +81,16 @@
 
   a {
 
-    background-image: file-url('folder-blue.svg');
-    max-width: 33%;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    padding-top: 5px;
+    display: inline-block;
+    vertical-align: top;
+
+    &:first-child {
+      background-image: file-url('folder-blue.svg');
+      max-width: 33%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
 
   }
 
diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html
index ef747046b..d342465b5 100644
--- a/app/templates/components/folder-path.html
+++ b/app/templates/components/folder-path.html
@@ -3,7 +3,8 @@
   service_id,
   template_type,
   fallback_page_title=None,
-  show_fallback_page_title=False
+  show_fallback_page_title=False,
+  link_current_item=False
 ) %}
   {% if show_fallback_page_title %}
     <h1 class="heading-large">
@@ -12,13 +13,13 @@
   {% else %}
     <h1 class="heading-medium folder-heading">
       {% for folder in folders %}
-        {% if loop.last %}
+        {% if loop.last and not link_current_item %}
           <span class="folder-heading-folder">{{ folder.name }}</span>
         {% else %}
           {% if folder.id %}
-            <a href="{{ url_for('.choose_template', service_id=service_id, template_type=template_type, template_folder_id=folder.id) }}">{{ folder.name }}</a> {{ folder_path_separator() }}
+            <a href="{{ url_for('.choose_template', service_id=service_id, template_type=template_type, template_folder_id=folder.id) }}">{{ folder.name }}</a> {% if not loop.last %}{{ folder_path_separator() }}{% endif %}
           {% else %}
-            <a href="{{ url_for('.choose_template', service_id=service_id, template_type=template_type) }}">Templates</a> {{ folder_path_separator() }}
+            <a href="{{ url_for('.choose_template', service_id=service_id, template_type=template_type) }}">Templates</a> {% if not loop.last %}{{ folder_path_separator() }}{% endif %}
           {% endif %}
         {% endif %}
       {% endfor %}
diff --git a/app/templates/views/templates/manage-template-folder.html b/app/templates/views/templates/manage-template-folder.html
index ae8990fd9..b638e8479 100644
--- a/app/templates/views/templates/manage-template-folder.html
+++ b/app/templates/views/templates/manage-template-folder.html
@@ -16,6 +16,7 @@
         folders=template_folder_path,
         service_id=current_service.id,
         template_type='all',
+        link_current_item=True
       ) }}
     </div>
   </div>