diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 51a1d6da32..dd4d539786 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -111,8 +111,9 @@
 										<button class="btn btn-sm btn-default edit" type="button" title="[[topic:edit]]"><i class="fa fa-pencil"></i></button>
 										<button class="btn btn-sm btn-default delete" type="button" title="[[topic:delete]]"><i class="fa fa-trash-o"></i></button>
 
-										<button class="btn btn-sm btn-default move {posts.display_move_tools}" type="button" title="[[topic:move]]"><i class="fa fa-arrows"></i></button>
-
+										<!-- IF posts.display_move_tools -->
+										<button class="btn btn-sm btn-default move" type="button" title="[[topic:move]]"><i class="fa fa-arrows"></i></button>
+										<!-- ENDIF posts.display_move_tools -->
 									</ul>
 								</div>
 							</div>
diff --git a/src/topics.js b/src/topics.js
index 99fa141625..e609889058 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -381,7 +381,7 @@ var async = require('async'),
 					var pid = postData[i].pid;
 					postData[i].favourited = fav_data[pid];
 					postData[i].display_moderator_tools = (current_user != 0) && privileges[pid].editable;
-					postData[i].display_move_tools = privileges[pid].move ? '' : 'hidden';
+					postData[i].display_move_tools = privileges[pid].move;
 					if(parseInt(postData[i].deleted, 10) === 1 && !privileges[pid].view_deleted) {
 						postData[i].content = 'This post is deleted!';
 					}