diff --git a/app/assets/javascripts/discourse/components/popup-menu.js.es6 b/app/assets/javascripts/discourse/components/popup-menu.js.es6
index a40096153f8..9be0b8f3ef8 100644
--- a/app/assets/javascripts/discourse/components/popup-menu.js.es6
+++ b/app/assets/javascripts/discourse/components/popup-menu.js.es6
@@ -1,7 +1,7 @@
 import { on } from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Component.extend({
-  classNameBindings: ["visible::hidden", ":popup-menu"],
+  classNameBindings: ["visible::hidden", ":popup-menu", "extraClasses"],
 
   @on('didInsertElement')
   _setup() {
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index ef0f07e4162..ae02b7b9cca 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -153,24 +153,24 @@
 
 {{#if currentUser.canManageTopic}}
   {{show-popup-button action="showTopicAdminMenu" class="show-topic-admin" title="topic_admin_menu" icon="wrench"}}
-  {{#popup-menu visible=adminMenuVisible hide="hideTopicAdminMenu" title="admin_title"}}
-    <li>
+  {{#popup-menu visible=adminMenuVisible hide="hideTopicAdminMenu" title="admin_title" extraClasses="topic-admin-popup-menu"}}
+    <li class="topic-admin-multi-select">
       {{d-button action="toggleMultiSelect" icon="tasks" label="topic.actions.multi_select"}}
     </li>
 
     {{#if model.details.can_delete}}
-      <li>
+      <li class="topic-admin-delete">
         {{d-button action="deleteTopic" icon="trash-o" label="topic.actions.delete" class="btn-danger"}}
       </li>
     {{/if}}
 
     {{#if showRecover}}
-      <li>
+      <li class="topic-admin-recover">
         {{d-button action="recoverTopic" icon="undo" label="topic.actions.recover"}}
       </li>
     {{/if}}
 
-    <li>
+    <li class="topic-admin-autoclose">
       {{#if model.closed}}
         {{d-button action="toggleClosed" icon="unlock" label="topic.actions.open"}}
       {{else}}
@@ -181,7 +181,7 @@
 
     {{#unless model.isPrivateMessage}}
       {{#if model.visible}}
-        <li>
+        <li class="topic-admin-pin">
           {{#if isFeatured}}
             {{d-button action="showFeatureTopic" icon="thumb-tack" label="topic.actions.unpin"}}
           {{else}}
@@ -191,11 +191,11 @@
       {{/if}}
     {{/unless}}
 
-    <li>
+    <li class="topic-admin-change-timestamp">
       {{d-button action="showChangeTimestamp" icon="calendar" label="topic.change_timestamp.title"}}
     </li>
 
-    <li>
+    <li class="topic-admin-archive">
       {{#if model.archived}}
         {{d-button action="toggleArchived" icon="folder" label="topic.actions.unarchive"}}
       {{else}}
@@ -203,7 +203,7 @@
       {{/if}}
     </li>
 
-    <li>
+    <li class="topic-admin-visible">
       {{#if model.visible}}
         {{d-button action="toggleVisibility" icon="eye-slash" label="topic.actions.invisible"}}
       {{else}}