diff --git a/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache b/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache
index c1f2bdea6b2..f1c9127a275 100644
--- a/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache
+++ b/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache
@@ -35,7 +35,7 @@
 
 }}
 
-<div class="d-flex p-3">
+<div class="d-flex p-3 justify-content-end">
     <button
         class="btn btn-link btn-icon my-1 icon-size-4"
         data-action="delete-selected-messages"
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_edit_mode.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_edit_mode.mustache
index bae82eed2d5..d8568f47231 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_edit_mode.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_edit_mode.mustache
@@ -40,7 +40,7 @@
 
 <div class="d-flex p-3">
     <button
-        class="btn btn-link btn-icon my-1 icon-size-4"
+        class="btn btn-link btn-icon my-1 icon-size-4 ml-auto"
         data-action="delete-selected-messages"
         data-toggle="tooltip"
         data-placement="top"
@@ -50,4 +50,4 @@
         <span class="hidden" data-region="loading-icon-container">{{> core/loading }}</span>
         <span class="sr-only">{{#str}} deleteselectedmessages, core_message {{/str}}</span>
     </button>
-</div>
\ No newline at end of file
+</div>