diff --git a/resources/report/js/custom.js b/resources/report/js/custom.js
index 9e6b6da6..a8892bfe 100644
--- a/resources/report/js/custom.js
+++ b/resources/report/js/custom.js
@@ -103,10 +103,12 @@ var messageDialogProto = Object.create(HTMLDialogElement.prototype, {
 
             var accept = document.createElement('button');
             accept.className = 'accept';
+            accept.textContent = 'Yes';
             buttons.appendChild(accept);
 
             var cancel = document.createElement('button');
             cancel.className = 'cancel';
+            accept.textContent = 'Cancel';
             buttons.appendChild(cancel);
         }
 
diff --git a/resources/report/js/script.js b/resources/report/js/script.js
index 3c1b6aa7..798c2f33 100644
--- a/resources/report/js/script.js
+++ b/resources/report/js/script.js
@@ -171,7 +171,6 @@ function showMessageDialog(title, text) {
 
     var dialog = new MessageDialog();
 
-    dialog.id = 'modalDialog';
     dialog.setAttribute('data-type', 'warn');
 
     dialog.getElementsByTagName('h1')[0].textContent = title;
@@ -180,6 +179,9 @@ function showMessageDialog(title, text) {
     dialog.addEventListener('close', closeMessageDialog, false);
     dialog.addEventListener('click', clickMessageButton, false);
 
+    dialog.querySelector('.accept').textContent = 'Yes';
+    showElement(dialog.querySelector('.cancel'));
+
     document.body.appendChild(dialog);
     dialog.showModal();
 }
@@ -187,17 +189,16 @@ function showMessageBox(type, title, text) {
 
     var dialog = new MessageDialog();
 
-    dialog.id = 'modalDialog';
     dialog.setAttribute('data-type', type);
 
     dialog.getElementsByTagName('h1')[0].textContent = title;
     dialog.getElementsByTagName('p')[0].textContent = text;
 
-    dialog.shadowRoot.querySelector('#accept').textContent = 'OK';
-    dialog.shadowRoot.querySelector('#accept').setAttribute('data-dialog', dialog.id);
-    dialog.shadowRoot.querySelector('#accept').addEventListener('click', hideDialog, false);
+    dialog.addEventListener('close', closeMessageDialog, false);
+    dialog.addEventListener('click', clickMessageButton, false);
 
-    hideElement(dialog.shadowRoot.querySelector('#cancel'));
+    dialog.querySelector('#accept').textContent = 'OK';
+    hideElement(dialog.querySelector('#cancel'));
 
     document.body.appendChild(dialog);
     dialog.showModal();