diff --git a/templates/comment.mustache b/templates/comment.mustache
index 39e147d..2e269cf 100644
--- a/templates/comment.mustache
+++ b/templates/comment.mustache
@@ -16,10 +16,10 @@
             <div class="chat-message-meta">
                 {{# dropdown }}
                     <div class="dropdown">          
-                        <a class="dropdown-toggle" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <a class="dropdown-toggle" id="dropdownMenuButton-{{ uuid }}" data-toggle="dropdown" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
                             <i title="{{# str }} actiondropdown, pdfannotator {{/ str }}" class="icon fa fa-cog fa-fw"></i>
                         </a>
-                        <div class="dropdown-menu dropdown-menu-right">
+                        <div class="dropdown-menu dropdown-menu-right dropdown-menu-end">
                             {{# report }}
                                 <span class="comment-report-button">
                                     <form action="view.php" method="POST">
diff --git a/templates/dropdownmenu.mustache b/templates/dropdownmenu.mustache
index 1bf3ba3..db6a4e0 100644
--- a/templates/dropdownmenu.mustache
+++ b/templates/dropdownmenu.mustache
@@ -1,5 +1,5 @@
 <div class="dropdown">
-    <a tabindex="0" class="dropdown-toggle icon-no-margin" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" aria-controls="action-menu-3-menu">
+    <a tabindex="0" class="dropdown-toggle icon-no-margin" data-toggle="dropdown" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" aria-controls="action-menu-3-menu">
         <i class="icon fa fa-cog fa-fw" aria-hidden="true" title="{{# str }} actiondropdown, pdfannotator {{/ str }}" aria-label="{{# str }} actiondropdown, pdfannotator {{/ str }}"></i>
     </a>
     <ul class="dropdown-menu">
diff --git a/templates/index.mustache b/templates/index.mustache
index 7cdc9f6..f578b56 100644
--- a/templates/index.mustache
+++ b/templates/index.mustache
@@ -98,7 +98,7 @@
                     </div> 
                 {{/useprintcomments}}
 
-                <button id="toolbar-dropdown-button" class="pdf-annotator-hidden" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
+                <button id="toolbar-dropdown-button" class="pdf-annotator-hidden" type="button" data-toggle="collapse" data-bs-toggle="collapse" data-target="#navbarNavAltMarkup" data-bs-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
                     <i class="icon fa fa-bars fa-lg"></i>
                 </button>
             </div>