diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
index 6d27a14a4..079fd5880 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
@@ -43,6 +43,10 @@
             $this->formatTime($comment->expiration)
         )) : '' ?>
     <?php if (isset($delCommentForm)) {
+        // Form is unset if the current user lacks the respective permission
+        $uniqId = uniqid();
+        $buttonId = 'delete-comment-' . $uniqId;
+        $textId = 'comment-' . $uniqId;
         $deleteButton = clone $delCommentForm;
         /** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm $deleteButton */
         $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
@@ -52,10 +56,14 @@
                 'comment_is_service'    => isset($comment->service_description)
             )
         );
+        $deleteButton->getElement('btn_submit')
+            ->setAttrib('aria-label', $this->translate('Delete comment'))
+            ->setAttrib('id', $buttonId)
+            ->setAttrib('aria-describedby', $buttonId . ' ' . $textId);
         echo $deleteButton;
     } ?>
     </span>
 </div>
-<p class="comment-text">
+<p class="comment-text"<?php if (isset($textId)): ?> id="<?= $textId ?>"<?php endif ?>>
     <?= $this->nl2br($this->escapeComment($comment->comment)) ?>
 </p>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index 96130db7a..eb9f26ac3 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -53,6 +53,9 @@
 
       <?php if (isset($delDowntimeForm)) {
           // Form is unset if the current user lacks the respective permission
+          $uniqId = uniqid();
+          $buttonId = 'delete-downtime-' . $uniqId;
+          $textId = 'downtime-' . $uniqId;
           $deleteButton = clone $delDowntimeForm;
           /** @var \Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm $deleteButton */
           $deleteButton->setAttrib('class', $deleteButton->getAttrib('class') . ' remove-action');
@@ -62,11 +65,15 @@
                   'downtime_is_service' => isset($downtime->service_description)
               )
           );
+          $deleteButton->getElement('btn_submit')
+              ->setAttrib('aria-label', $this->translate('Delete downtime'))
+              ->setAttrib('id', $buttonId)
+              ->setAttrib('aria-describedby', $buttonId . ' ' . $textId);
           echo $deleteButton;
       } ?>
     </span>
   </div>
-  <p class="comment-text">
+  <p class="comment-text"<?php if (isset($textId)): ?> id="<?= $textId ?>"<?php endif ?>>
     <?= $this->nl2br($this->escapeComment($downtime->comment)) ?>
   </p>
 </td>