diff --git a/web/src/emoji_picker.js b/web/src/emoji_picker.js
index 2d5daf6924..6739731580 100644
--- a/web/src/emoji_picker.js
+++ b/web/src/emoji_picker.js
@@ -796,10 +796,10 @@ function register_click_handlers() {
         );
     });
 
-    $("body").on("click", "#set-user-status-modal #selected_emoji", (e) => {
+    $("body").on("click", "#set-user-status-modal #selected_emoji .status-emoji-wrapper", (e) => {
         e.preventDefault();
         e.stopPropagation();
-        toggle_emoji_popover(e.target, undefined, {placement: "bottom"});
+        toggle_emoji_popover(e.currentTarget, undefined, {placement: "bottom"});
         if (is_open()) {
             // Because the emoji picker gets drawn on top of the user
             // status modal, we need this hack to make clicking outside
@@ -812,6 +812,12 @@ function register_click_handlers() {
         }
     });
 
+    $("body").on(
+        "keydown",
+        "#set-user-status-modal #selected_emoji .status-emoji-wrapper",
+        ui_util.convert_enter_to_click,
+    );
+
     $(document).on("click", ".emoji-popover-emoji.status-emoji", function (e) {
         e.preventDefault();
         e.stopPropagation();
diff --git a/web/styles/user_status.css b/web/styles/user_status.css
index 3c90ae0056..8260789be3 100644
--- a/web/styles/user_status.css
+++ b/web/styles/user_status.css
@@ -23,7 +23,7 @@
         .status-emoji-wrapper {
             padding: 4px 8px;
             border-right: 1px solid;
-            border-color: inherit;
+            border-color: hsl(0deg 0% 0% / 60%);
             cursor: pointer;
 
             .selected-emoji {
diff --git a/web/templates/set_status_overlay.hbs b/web/templates/set_status_overlay.hbs
index ff00c50c58..d59f856114 100644
--- a/web/templates/set_status_overlay.hbs
+++ b/web/templates/set_status_overlay.hbs
@@ -1,6 +1,8 @@
 <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">
-        {{> status_emoji_selector}}
+    <div class="tippy-zulip-tooltip" data-tippy-content="{{t 'Select emoji' }}" data-tippy-placement="top" aria-label="{{t 'Select emoji' }}" id="selected_emoji">
+        <div class="status-emoji-wrapper" tabindex="0">
+            {{> status_emoji_selector}}
+        </div>
     </div>
     <input type="text" class="user-status modal_text_input" placeholder="{{t 'Your status' }}" maxlength="60"/>
     <button type="button" class="btn clear_search_button" id="clear_status_message_button" disabled="disabled">