diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 71ab3011af..866f8ecdf6 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -537,8 +537,13 @@ define(['taskbar'], function(taskbar) {
 				files = dt.files;
 
 			if(files.length) {
+				var fd = new FormData();
+				for (var i = 0, file; file = dt.files[i]; i++) {
+					fd.append('files[]', file, file.name);
+				}
+
 				fileForm[0].reset();
-				fileForm.find('#files')[0].files = files;
+				uploadSubmit(files, post_uuid, '/api/post/upload', fd);
 			}
 
 			drop.hide();
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index a25e50fcdd..76e937b93c 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -65,7 +65,7 @@
 						</div>
 
 						<div class="btn-group">
-							<button class="btn btn-sm btn-default follow" type="button" title="[[topic:notify_me]]"><i class="fa fa-eye"></i></button>
+							<button class="btn btn-sm btn-default follow hide" type="button" title="[[topic:notify_me]]"><i class="fa fa-eye"></i></button>
 							<button class="btn btn-sm btn-default flag" type="button" title="[[topic:flag_title]]"><i class="fa fa-flag-o"></i></button>
 							<button data-favourited="{posts.favourited}" class="favourite favourite-tooltip btn btn-sm btn-default <!-- IF posts.favourited --> btn-warning <!-- ENDIF posts.favourited -->" type="button">
 								<span class="favourite-text">[[topic:favourite]]</span>