diff --git a/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs b/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs
index 511a57b4c2f..7b054f69f36 100644
--- a/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs
@@ -281,11 +281,11 @@ export default class TopicAdminMenu extends Component {
                       @icon="hourglass-start"
                     />
                   </dropdown.item>
-
-                  <dropdown.divider />
                 {{/if}}
 
                 {{#if (or this.currentUser.staff this.extraButtons.length)}}
+                  <dropdown.divider />
+
                   {{#if this.currentUser.staff}}
                     <dropdown.item class="topic-admin-moderation-history">
                       <DButton