diff --git a/web/src/hotkey.js b/web/src/hotkey.js
index f8ad357bf1..5c2ae06989 100644
--- a/web/src/hotkey.js
+++ b/web/src/hotkey.js
@@ -267,7 +267,7 @@ export function process_escape_key(e) {
     if (popovers.any_active()) {
         if (user_card_popover.user_info_manage_menu_popped()) {
             user_card_popover.hide_user_info_popover_manage_menu();
-            $("#user_info_popover .user_info_popover_manage_menu_btn").trigger("focus");
+            $("#user_info_popover .user-card-popover-manage-menu-btn").trigger("focus");
             return true;
         }
         popovers.hide_all();
diff --git a/web/src/popovers.js b/web/src/popovers.js
index b7d8979556..024c60fa83 100644
--- a/web/src/popovers.js
+++ b/web/src/popovers.js
@@ -73,7 +73,7 @@ export function popover_items_handle_keyboard(key, $items) {
         return;
     }
     if (index === -1) {
-        if ($(".user_info_popover_manage_menu_btn").is(":visible")) {
+        if ($(".user-card-popover-manage-menu-btn").is(":visible")) {
             index = 1;
         } else {
             index = 0;
diff --git a/web/src/user_card_popover.js b/web/src/user_card_popover.js
index 8d4c91e2d1..29d2973544 100644
--- a/web/src/user_card_popover.js
+++ b/web/src/user_card_popover.js
@@ -469,7 +469,7 @@ function focus_user_info_popover_item() {
     // Our popup menus act kind of funny when you mix keyboard and mouse.
     const $items = get_user_info_popover_for_message_items();
 
-    if ($(".user_info_popover_manage_menu_btn").is(":visible")) {
+    if ($(".user-card-popover-manage-menu-btn").is(":visible")) {
         focus_first_popover_item($items, 1);
     } else {
         focus_first_popover_item($items);
@@ -786,7 +786,7 @@ export function register_click_handlers() {
         user_profile.show_user_profile(user, "manage-profile-tab");
     });
 
-    $("body").on("click", ".user_info_popover_manage_menu_btn", (e) => {
+    $("body").on("click", ".user-card-popover-manage-menu-btn", (e) => {
         e.preventDefault();
         e.stopPropagation();
         const user_id = elem_to_user_id($(e.target).parents("ul"));
diff --git a/web/styles/popovers.css b/web/styles/popovers.css
index 861eca26fc..da5da60c35 100644
--- a/web/styles/popovers.css
+++ b/web/styles/popovers.css
@@ -101,7 +101,7 @@
     line-height: 1;
 }
 
-.user_info_popover_manage_menu_btn {
+.user-card-popover-manage-menu-btn {
     &:hover,
     &:focus {
         text-decoration: none;
@@ -145,7 +145,7 @@
     }
 }
 
-.info_popover_actions .user_info_popover_manage_menu_btn {
+.info_popover_actions .user-card-popover-manage-menu-btn {
     opacity: 0.8;
 
     &:hover {
diff --git a/web/templates/user_card_popover_content.hbs b/web/templates/user_card_popover_content.hbs
index 0932d38953..802a886919 100644
--- a/web/templates/user_card_popover_content.hbs
+++ b/web/templates/user_card_popover_content.hbs
@@ -11,7 +11,7 @@
         {{/if}}
         {{#if show_manage_menu }}
         <span class="user-card-popover-action-buttons">
-            <a class="user_info_popover_manage_menu_btn" role="button" tabindex="0" aria-haspopup="true">
+            <a class="user-card-popover-manage-menu-btn" role="button" tabindex="0" aria-haspopup="true">
                 <i class="popover_action_icon zulip-icon zulip-icon-more-vertical" aria-hidden="true"></i>
             </a>
         </span>