diff --git a/assets/js/utils/message.js b/assets/js/utils/message.js
index dd1ef2fc..8ba3d2a5 100644
--- a/assets/js/utils/message.js
+++ b/assets/js/utils/message.js
@@ -105,6 +105,10 @@ window.App.Utils.Message = (function () {
             backdrop: 'static',
         });
 
+        $messageModal.on('shown.bs.modal', () => {
+            $messageModal.find('.modal-footer button:last').focus();
+        });
+
         messageModal.show();
 
         $messageModal.css('z-index', '99999').next().css('z-index', '9999');