diff --git a/static/js/ui_init.js b/static/js/ui_init.js
index 27d9def8f7..45e260f8b8 100644
--- a/static/js/ui_init.js
+++ b/static/js/ui_init.js
@@ -95,14 +95,13 @@ function message_hover(message_row) {
     if (current_message_hover && rows.id(current_message_hover) === id) {
         return;
     }
-    // Don't allow on-hover editing for local-only messages
-    if (message_row.hasClass("local")) {
-        return;
-    }
+
     const message = current_msg_list.get(rows.id(message_row));
     message_unhover();
     current_message_hover = message_row;
 
+    // Locally echoed messages have !is_topic_editable and thus go
+    // through this code path.
     if (!message_edit.is_topic_editable(message)) {
         // The actions and reactions icon hover logic is handled entirely by CSS
         return;
diff --git a/static/templates/message_controls.hbs b/static/templates/message_controls.hbs
index 5b887263e9..2884752961 100644
--- a/static/templates/message_controls.hbs
+++ b/static/templates/message_controls.hbs
@@ -1,8 +1,6 @@
 <div class="message_controls{{#status_message}} sender-status-controls{{/status_message}} no-select">
     {{#if msg/sent_by_me}}
-        {{#unless msg/locally_echoed}}
-        <div class="edit_content"></div>
-        {{/unless}}
+    <div class="edit_content"></div>
     {{/if}}
 
     {{#unless msg/sent_by_me}}