diff --git a/static/templates/actions_popover_content.handlebars b/static/templates/actions_popover_content.handlebars
index 2c3b48a884..ac3628ea0e 100644
--- a/static/templates/actions_popover_content.handlebars
+++ b/static/templates/actions_popover_content.handlebars
@@ -1,5 +1,13 @@
 {{! Contents of the "message actions" popup }}
 <ul class="nav nav-list actions_popover pull-right">
+  {{#if can_edit_message}}
+  <li>
+    <a href="#" class="popover_edit_message" data-msgid="{{message.id}}">
+      <i class="icon-vector-pencil"></i> Edit this message
+    </a>
+  </li>
+  {{/if}}
+
   <li>
     <a href="#" class="respond_button">
       <i class="icon-vector-share-alt"></i>
@@ -50,14 +58,6 @@
     </li>
   {{/if}}
 
-  {{#if can_edit_message}}
-  <li>
-    <a href="#" class="popover_edit_message" data-msgid="{{message.id}}">
-      <i class="icon-vector-pencil"></i> Edit this message
-    </a>
-  </li>
-  {{/if}}
-
   <li>
     <a href="#" class="popover_toggle_collapse" data-msgid="{{message.id}}">
       <i class="{{#if message.collapsed}}icon-vector-plus{{else}}icon-vector-minus{{/if}}"></i>