diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss
index 87c1198a8..3657a2878 100644
--- a/app/assets/stylesheets/components/message.scss
+++ b/app/assets/stylesheets/components/message.scss
@@ -24,17 +24,22 @@
   margin-top: $gutter;
 }
 
-.template-list-item,
-.template-list-item-with-checkbox {
-  position: relative;
-}
+.template-list {
 
-.template-list-item-with-checkbox {
+  &-item {
 
-  padding-left: $gutter * 2;
+    &-with-checkbox {
+
+      position: relative;
+      padding-left: $gutter * 2;
+
+      .multiple-choice {
+        position: absolute;
+        left: 0;
+      }
+
+    }
 
-  .multiple-choice {
-    position: absolute;
-    left: 0;
   }
+
 }
diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index f4425c8e9..96ecbff53 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -10,7 +10,7 @@
           value=template_folder.id,
         ) }}
       {% endif %}
-      <h2 class="message-name">
+      <h2 class="message-name template-list-folder">
         <a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type, template_folder_id=template_folder.id) }}">
           {{ template_folder.name }}
         </a>