diff --git a/src/core/xsl/navbar.xsl b/src/core/xsl/navbar.xsl
index ee4df81be60558e6b6aa2e558096d7420636349f..529945d7c37a95a0687473dce34f0269e2942c92 100644
--- a/src/core/xsl/navbar.xsl
+++ b/src/core/xsl/navbar.xsl
@@ -135,7 +135,7 @@
                 <span id="caosdb-f-bookmarks-collection-counter" class="badge bg-secondary">0</span>
                   Bookmarks
                 </a>
-              <ul class="dropdown-menu dropdown-menu-light" aria-labelledby="navbarBookmarkMenuLink">
+              <ul class="dropdown-menu dropdown-menu-end dropdown-menu-light" aria-labelledby="navbarBookmarkMenuLink">
                 <li class="disabled" id="caosdb-f-bookmarks-collection-link"
                     title="Show all bookmarked entities.">
                   <a class="dropdown-item">Show all</a></li>
@@ -234,10 +234,10 @@
             <i class="bi-person-fill"></i>
             <span class="caret"></span>
           </a>
-          <ul class="dropdown-menu dropdown-menu-light">
+          <ul class="dropdown-menu dropdown-menu-end dropdown-menu-light">
             <xsl:if test="/Response/@realm='${BUILD_MODULE_USER_MANAGEMENT_CHANGE_OWN_PASSWORD_REALM}'">
               <li>
-                <a title="Change your password." href="#" data-toggle="modal" data-target="#caosdb-f-change-password-form">Change Password</a>
+                <a class="dropdown-item" title="Change your password." href="#" data-bs-toggle="modal" data-bs-target="#caosdb-f-change-password-form">Change Password</a>
               </li>
             </xsl:if>
             <li>