diff --git a/templates/partials/topic/post-menu-list.tpl b/templates/partials/topic/post-menu-list.tpl
index 77ea089..589aec4 100644
--- a/templates/partials/topic/post-menu-list.tpl
+++ b/templates/partials/topic/post-menu-list.tpl
@@ -96,17 +96,23 @@
 	{{{end}}}
 <!-- ENDIF !posts.deleted -->
 
-<!-- IF posts.display_flag_tools -->
+{{{ if posts.display_flag_tools }}}
 <li class="divider"></li>
-{{{ if !posts.flags.flagged }}}
-<li><a component="post/flag" role="menuitem" tabindex="-1" href="#"><i class="fa fa-fw fa-flag"></i> [[topic:flag-post]]</a></li>
+
+<li {{{ if posts.flags.flaggged }}}hidden{{{ end }}}>
+	<a component="post/flag" role="menuitem" tabindex="-1" href="#"><i class="fa fa-fw fa-flag"></i> [[topic:flag-post]]</a>
+</li>
+<li {{{ if !posts.flags.flagged }}}hidden{{{ end }}} class="disabled text-muted">
+	<a component="post/already-flagged" role="menuitem" tabindex="-1" href="#"><i class="fa fa-fw fa-flag"></i> [[topic:already-flagged]]</a>
+</li>
+
 {{{ if (!posts.selfPost && posts.uid) }}}
-<li><a component="post/flagUser" role="menuitem" tabindex="-1" href="#"><i class="fa fa-fw fa-flag"></i> [[topic:flag-user]]</a></li>
+<li>
+	<a component="post/flagUser" role="menuitem" tabindex="-1" href="#"><i class="fa fa-fw fa-flag"></i> [[topic:flag-user]]</a>
+</li>
 {{{ end }}}
-{{{ else }}}
-<li class="disabled text-muted"><a role="menuitem" tabindex="-1" href="#"><i class="fa fa-fw fa-flag"></i> [[topic:already-flagged]]</li>
 {{{ end }}}
-<!-- ENDIF posts.display_flag_tools -->
+
 <!-- IF posts.display_moderator_tools -->
 {{{ if posts.flags.exists }}}
 <li><a role="menuitem" tabindex="-1" href="{config.relative_path}/flags/{posts.flags.flagId}"><i class="fa fa-fw fa-exclamation-circle"></i> [[topic:view-flag-report]]</a></li>