diff --git a/static/templates/single_message.handlebars b/static/templates/single_message.handlebars
index 577a24ccd5..cbaf975922 100644
--- a/static/templates/single_message.handlebars
+++ b/static/templates/single_message.handlebars
@@ -23,7 +23,7 @@
                                         {{{ status_message }}}
                                     </span>
                                     {{#if_and last_edit_timestr include_sender}}
-                                    <div class="message_edit_notice" title="{{#tr this}}Edited (__last_edit_timestr__){{/tr}}">
+                                    <div class="message_edit_notice auto-select" title="{{#tr this}}Edited (__last_edit_timestr__){{/tr}}">
                                         ({{t "EDITED" }})
                                     </div>
                                     {{/if_and}}
@@ -75,7 +75,7 @@
                 <div class="message_content">{{#unless status_message}}{{#if use_match_properties}}{{{msg/match_content}}}{{else}}{{{msg/content}}}{{/if}}{{/unless}}</div>
                 {{#if last_edit_timestr}}
                     {{#unless include_sender}}
-                    <div class="message_edit_notice" title="{{#tr this}}Edited (__last_edit_timestr__){{/tr}}">
+                    <div class="message_edit_notice auto-select" title="{{#tr this}}Edited (__last_edit_timestr__){{/tr}}">
                         ({{t "EDITED" }})
                     </div>
                     {{/unless}}