diff --git a/templates/partials/topic/post-menu-list.tpl b/templates/partials/topic/post-menu-list.tpl
index 5e5c41e..4bfea7b 100644
--- a/templates/partials/topic/post-menu-list.tpl
+++ b/templates/partials/topic/post-menu-list.tpl
@@ -21,14 +21,6 @@
 	</a>
 </li>
 
-<!-- BEGIN posts.tools -->
-<li role="presentation">
-	<a component="{posts.tools.action}" role="menuitem" tabindex="-1" href="#">
-		<span class="menu-icon"><i class="fa {posts.tools.icon}"></i></span> {{posts.tools.html}}
-	</a>
-</li>
-<!-- END posts.tools -->
-
 <!-- IF posts.display_history -->
 <li role="presentation">
 	<a component="post/view-history" role="menuitem" tabindex="-1" href="#">
@@ -59,9 +51,18 @@
 </li>
 <!-- ENDIF posts.display_ip_ban -->
 <!-- ENDIF posts.ip -->
+<!-- ENDIF posts.display_moderator_tools -->
 
+<!-- BEGIN posts.tools -->
+<li role="presentation">
+	<a component="{posts.tools.action}" role="menuitem" tabindex="-1" href="#">
+		<span class="menu-icon"><i class="fa {posts.tools.icon}"></i></span> {{posts.tools.html}}
+	</a>
+</li>
+<!-- END posts.tools -->
+<!-- IF posts.toolsVisible -->
 <li role="presentation" class="divider"></li>
-<!-- ENDIF posts.display_moderator_tools -->
+<!-- ENDIF posts.toolsVisible -->
 
 <!-- IF !posts.deleted -->
 <!-- IF config.loggedIn -->