diff --git a/web/e2e-tests/user-status.test.ts b/web/e2e-tests/user-status.test.ts
index e6e1825177..793d5f2864 100644
--- a/web/e2e-tests/user-status.test.ts
+++ b/web/e2e-tests/user-status.test.ts
@@ -43,12 +43,12 @@ async function test_user_status(page: Page): Promise<void> {
     await page.waitForFunction(
         () => (document.querySelector(".user-status") as HTMLInputElement).value === "",
     );
-    await page.waitForSelector(".status_emoji_wrapper .smiley_icon", {visible: true});
+    await page.waitForSelector(".status-emoji-wrapper .smiley_icon", {visible: true});
 
     // Manually adding everything.
     await page.type(".user-status", "Busy");
     const tada_emoji_selector = ".emoji-1f389";
-    await page.click(".status_emoji_wrapper .smiley_icon");
+    await page.click(".status-emoji-wrapper .smiley_icon");
     // Wait until emoji popover is opened.
     await page.waitForSelector(`.emoji-popover  ${tada_emoji_selector}`, {visible: true});
     await page.click(`.emoji-popover  ${tada_emoji_selector}`);
diff --git a/web/src/user_status_ui.js b/web/src/user_status_ui.js
index d7e8f03379..f0270d80de 100644
--- a/web/src/user_status_ui.js
+++ b/web/src/user_status_ui.js
@@ -118,7 +118,7 @@ function rebuild_status_emoji_selector_ui(selected_emoji_info) {
         selected_emoji = selected_emoji_info;
     }
     const rendered_status_emoji_selector = render_status_emoji_selector({selected_emoji});
-    $("#set-user-status-modal .status_emoji_wrapper").html(rendered_status_emoji_selector);
+    $("#set-user-status-modal .status-emoji-wrapper").html(rendered_status_emoji_selector);
 }
 
 function user_status_post_render() {
diff --git a/web/styles/user_status.css b/web/styles/user_status.css
index 6914530020..763e30b4f6 100644
--- a/web/styles/user_status.css
+++ b/web/styles/user_status.css
@@ -19,7 +19,7 @@
             }
         }
 
-        .status_emoji_wrapper {
+        .status-emoji-wrapper {
             height: 20px;
             width: 22px;
             padding: 8px 8px 1px;
diff --git a/web/templates/set_status_overlay.hbs b/web/templates/set_status_overlay.hbs
index b32e0e9bbd..e34ecd1227 100644
--- a/web/templates/set_status_overlay.hbs
+++ b/web/templates/set_status_overlay.hbs
@@ -1,5 +1,5 @@
 <div class="new-style user-status-content-wrapper">
-    <div class="status_emoji_wrapper tippy-zulip-tooltip"  data-tippy-content="{{t 'Select emoji' }}" data-tippy-placement="top" aria-label="{{t 'Select emoji' }}"  tabindex="0" id="selected_emoji">
+    <div class="status-emoji-wrapper tippy-zulip-tooltip"  data-tippy-content="{{t 'Select emoji' }}" data-tippy-placement="top" aria-label="{{t 'Select emoji' }}"  tabindex="0" id="selected_emoji">
         {{> status_emoji_selector}}
     </div>
     <input type="text" class="user-status" placeholder="{{t 'Your status' }}" maxlength="60"/>