diff --git a/app/components/sidebars/main/channels_list/channel_item/__snapshots__/channel_item.test.js.snap b/app/components/sidebars/main/channels_list/channel_item/__snapshots__/channel_item.test.js.snap
index 2987e202c..302538d24 100644
--- a/app/components/sidebars/main/channels_list/channel_item/__snapshots__/channel_item.test.js.snap
+++ b/app/components/sidebars/main/channels_list/channel_item/__snapshots__/channel_item.test.js.snap
@@ -87,6 +87,7 @@ exports[`ChannelItem should match snapshot 1`] = `
                 "fontFamily": "Open Sans",
                 "fontSize": 16,
                 "lineHeight": 24,
+                "maxWidth": "80%",
                 "paddingRight": 10,
               },
               Object {
@@ -202,6 +203,7 @@ exports[`ChannelItem should match snapshot for current user i.e currentUser (you
                 "fontFamily": "Open Sans",
                 "fontSize": 16,
                 "lineHeight": 24,
+                "maxWidth": "80%",
                 "paddingRight": 10,
               },
               Object {
@@ -316,6 +318,7 @@ exports[`ChannelItem should match snapshot for current user i.e currentUser (you
                 "fontFamily": "Open Sans",
                 "fontSize": 16,
                 "lineHeight": 24,
+                "maxWidth": "80%",
                 "paddingRight": 10,
               },
               Object {
@@ -430,6 +433,7 @@ exports[`ChannelItem should match snapshot for deactivated user and is currentCh
                 "fontFamily": "Open Sans",
                 "fontSize": 16,
                 "lineHeight": 24,
+                "maxWidth": "80%",
                 "paddingRight": 10,
               },
               Object {
@@ -533,6 +537,7 @@ exports[`ChannelItem should match snapshot for deactivated user and is searchRes
                 "fontFamily": "Open Sans",
                 "fontSize": 16,
                 "lineHeight": 24,
+                "maxWidth": "80%",
                 "paddingRight": 10,
               },
               Object {
@@ -637,6 +642,7 @@ exports[`ChannelItem should match snapshot for deactivated user and not searchRe
                 "fontFamily": "Open Sans",
                 "fontSize": 16,
                 "lineHeight": 24,
+                "maxWidth": "80%",
                 "paddingRight": 10,
               },
               Object {
@@ -745,6 +751,7 @@ exports[`ChannelItem should match snapshot with draft 1`] = `
                 "fontFamily": "Open Sans",
                 "fontSize": 16,
                 "lineHeight": 24,
+                "maxWidth": "80%",
                 "paddingRight": 10,
               },
               Object {
@@ -851,6 +858,7 @@ exports[`ChannelItem should match snapshot with mentions and muted 1`] = `
                 "fontFamily": "Open Sans",
                 "fontSize": 16,
                 "lineHeight": 24,
+                "maxWidth": "80%",
                 "paddingRight": 10,
               },
               Object {
diff --git a/app/components/sidebars/main/channels_list/channel_item/channel_item.js b/app/components/sidebars/main/channels_list/channel_item/channel_item.js
index bfdf56f88..9d42e742f 100644
--- a/app/components/sidebars/main/channels_list/channel_item/channel_item.js
+++ b/app/components/sidebars/main/channels_list/channel_item/channel_item.js
@@ -245,6 +245,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             fontSize: 16,
             lineHeight: 24,
             paddingRight: 10,
+            maxWidth: '80%',
             flex: 1,
             alignSelf: 'center',
             fontFamily: 'Open Sans',