diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html
index 31084c30..6e7da0a1 100644
--- a/mediagoblin/templates/mediagoblin/edit/attachments.html
+++ b/mediagoblin/templates/mediagoblin/edit/attachments.html
@@ -46,8 +46,8 @@
           <li>
 	    <a target="_blank" href="{{ request.app.public_store.file_url(
 				     attachment['filepath']) }}">
-	      {{ attachment.name -}}
-	    </a><br />
+	      {{- attachment.name -}}
+	    </a>
 	  </li>
 	{% endfor %}
       </ul>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index b870a8ae..8c2a618d 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -173,7 +173,7 @@
         {% for attachment in media.attachment_files %}
           <li>
             <a href="{{ request.app.public_store.file_url(attachment.filepath) }}">
-              {{ attachment.name }}
+              {{- attachment.name -}}
             </a>
           </li>
         {% endfor %}