diff --git a/web/comment_manager.css b/web/comment_manager.css
index 6a41ff56d..fadd9b9d4 100644
--- a/web/comment_manager.css
+++ b/web/comment_manager.css
@@ -37,11 +37,6 @@
     align-items: flex-start;
     gap: 4px;
 
-    *:focus-visible {
-      outline: 2px solid var(--comment-focus-outline-color);
-      outline-offset: 0;
-    }
-
     #commentManagerToolbar {
       width: 100%;
       height: 32px;
diff --git a/web/viewer.html b/web/viewer.html
index daa1fc148..a22e0b863 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -792,12 +792,12 @@ See https://github.com/adobe-type-tools/cmap-resources
         </div>
       </dialog>
 
-      <dialog class="dialog commentManager" id="commentManagerDialog">
+      <dialog class="dialog commentManager" id="commentManagerDialog" aria-labelledby="commentManagerTitle">
         <div class="mainContainer">
           <div class="title" id="commentManagerToolbar">
-            <span id="commentManagerTitle" role="sectionhead" data-l10n-id="pdfjs-editor-edit-comment-dialog-title-when-adding" tabindex="0"></span>
+            <span id="commentManagerTitle" role="sectionhead" data-l10n-id="pdfjs-editor-edit-comment-dialog-title-when-adding"></span>
           </div>
-          <textarea id="commentManagerTextInput" data-l10n-id="pdfjs-editor-edit-comment-dialog-text-input"></textarea>
+          <textarea id="commentManagerTextInput" data-l10n-id="pdfjs-editor-edit-comment-dialog-text-input" tabindex="0"></textarea>
           <div class="dialogButtonsGroup">
             <button id="commentManagerCancelButton" type="button" class="secondaryButton" tabindex="0">
               <span data-l10n-id="pdfjs-editor-edit-comment-dialog-cancel-button"></span>