diff --git a/lib/templates/modal.mustache b/lib/templates/modal.mustache
index 8cf231cf616..0430b1aacc8 100644
--- a/lib/templates/modal.mustache
+++ b/lib/templates/modal.mustache
@@ -40,8 +40,8 @@
     }
 }}
 
-<div class="modal moodle-has-zindex" data-region="modal-container" aria-hidden="true" role="dialog">
-    <div class="modal-dialog {{$classes}}{{classes}}{{/classes}}" role="document" data-region="modal" aria-labelledby="{{uniqid}}-modal-title" tabindex="0">
+<div class="modal moodle-has-zindex" data-region="modal-container" aria-hidden="true" role="dialog" aria-modal="true" aria-labelledby="{{uniqid}}-modal-title">
+    <div class="modal-dialog {{$classes}}{{classes}}{{/classes}}" data-region="modal" tabindex="0">
         <div class="modal-content">
             <div class="modal-header {{$headerclasses}}{{headerclasses}}{{/headerclasses}}" data-region="header">