diff --git a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.scss b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.scss
index 30e3f03f5e..c31f2faf81 100644
--- a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.scss
+++ b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.scss
@@ -23,12 +23,23 @@
             + .tab-button-wrapper {
                 margin-left: 4px;
             }
+
+            Button {
+                display: flex;
+                max-width: 100%;
+
+                .Button_label {
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
+            }
         }
 
         .left {
-            display: flex;
+            display: grid;
             height: 100%;
-            align-items: center;
+            grid-template-columns: minmax(0, auto) minmax(0, auto);
         }
 
         .right-anchor {