diff --git a/static/js/message_edit.js b/static/js/message_edit.js
index 8ecab101ae..9ab2a4761e 100644
--- a/static/js/message_edit.js
+++ b/static/js/message_edit.js
@@ -403,7 +403,7 @@ function edit_message(row, raw_content) {
         message_edit_topic.val('');
         message_edit_topic.focus();
     } else if (editability === editability_types.TOPIC_ONLY) {
-        row.find(".message_edit_cancel").focus();
+        row.find(".message_edit_topic").focus();
     } else {
         message_edit_content.focus();
         // Put cursor at end of input.