diff --git a/message/templates/message_drawer.mustache b/message/templates/message_drawer.mustache
index 215cf15d922..dcb79a7f15b 100644
--- a/message/templates/message_drawer.mustache
+++ b/message/templates/message_drawer.mustache
@@ -37,8 +37,10 @@
     {{$drawercontent}}
         <div id="message-drawer-{{uniqid}}" class="message-app" data-region="message-drawer" role="region">
             <div class="closewidget bg-light border-bottom text-right">
-                <a class="text-dark" data-action="closedrawer" href="#">
-                     {{#pix}} i/window_close, core, {{#str}} closebuttontitle {{/str}} {{/pix}}
+                <a class="text-dark" data-action="closedrawer" href="#"
+                   title="{{#str}} closebuttontitle {{/str}}" aria-label="{{#str}} closebuttontitle {{/str}}"
+                >
+                    {{#pix}} i/window_close, core {{/pix}}
                 </a>
             </div>
             <div class="header-container position-relative" data-region="header-container">