diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss
index 69baaf689..a0426c916 100644
--- a/app/assets/stylesheets/components/message.scss
+++ b/app/assets/stylesheets/components/message.scss
@@ -163,5 +163,10 @@
 
   }
 
+  &-manage-link {
+    display: block;
+    text-align: right;
+    padding: ($gutter - 2px) 0 0 0;
+  }
 
 }
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index 29234898d..0b0b0afc3 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -49,7 +49,7 @@
   {% else %}
 
     <div class="grid-row {% if current_service.all_template_folders %}bottom-gutter-1-2{% else %}bottom-gutter-2-3{% endif %}">
-      <div class="column-two-thirds">
+      <div class="{% if can_manage_folders %} column-five-sixths {% else %} column-two-thirds {% endif %}">
         {{ folder_path(
           folders=template_folder_path,
           service_id=current_service.id,
@@ -59,14 +59,16 @@
         ) }}
       </div>
       {% if current_user.has_permissions('manage_templates') %}
-        <div class="column-one-third">
         {% if not can_manage_folders %}
-          <a href="{{ url_for('.add_template_by_type', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="button align-with-heading">Add new template</a>
+          <div class="column-one-third">
+            <a href="{{ url_for('.add_template_by_type', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="button align-with-heading">Add new template</a>
+          </div>
         {% endif %}
         {% if can_manage_folders and current_template_folder_id %}
-          <a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="align-with-heading">Manage</a>
+          <div class="column-one-sixth">
+            <a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="folder-heading-manage-link">Manage</a>
+          </div>
         {% endif %}
-        </div>
       {% endif %}
     </div>