diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 3fc9eafc3c2..d457cbde21a 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -159,6 +159,9 @@
     }
 
     .item-label {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
       color: var(--primary);
     }
 
diff --git a/plugins/chat/assets/stylesheets/common/direct-message-creator.scss b/plugins/chat/assets/stylesheets/common/direct-message-creator.scss
index 02444815adf..45e08936e1c 100644
--- a/plugins/chat/assets/stylesheets/common/direct-message-creator.scss
+++ b/plugins/chat/assets/stylesheets/common/direct-message-creator.scss
@@ -158,7 +158,8 @@
         margin-left: 0.3em;
 
         .emoji {
-          margin-bottom: 0.2em;
+          width: 15px;
+          height: 15px;
         }
       }
     }
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-index.scss b/plugins/chat/assets/stylesheets/mobile/chat-index.scss
index 7659920f80a..1ee7c146b13 100644
--- a/plugins/chat/assets/stylesheets/mobile/chat-index.scss
+++ b/plugins/chat/assets/stylesheets/mobile/chat-index.scss
@@ -70,6 +70,7 @@
       }
 
       &__name {
+        flex-shrink: 0;
         margin-left: 0.75em;
         font-size: var(--font-up-1);
       }
@@ -77,6 +78,11 @@
       &__category-badge {
         font-size: var(--font-up-1);
       }
+
+      &__user-status-message {
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
     }
   }