diff --git a/src/components/left/newChat/NewChatStep1.tsx b/src/components/left/newChat/NewChatStep1.tsx
index 42c6ade67..3145110e1 100644
--- a/src/components/left/newChat/NewChatStep1.tsx
+++ b/src/components/left/newChat/NewChatStep1.tsx
@@ -101,11 +101,11 @@ const NewChatStep1: FC<OwnProps & StateProps & DispatchProps> = ({
   ]);
 
   const handleNextStep = useCallback(() => {
-    if (selectedMemberIds.length) {
+    if (selectedMemberIds.length || isChannel) {
       setGlobalSearchQuery({ query: '' });
       onNextStep();
     }
-  }, [selectedMemberIds, setGlobalSearchQuery, onNextStep]);
+  }, [selectedMemberIds.length, isChannel, setGlobalSearchQuery, onNextStep]);
 
   const lang = useLang();
 
@@ -136,7 +136,7 @@ const NewChatStep1: FC<OwnProps & StateProps & DispatchProps> = ({
         />
 
         <FloatingActionButton
-          isShown={Boolean(selectedMemberIds.length)}
+          isShown={Boolean(selectedMemberIds.length || isChannel)}
           onClick={handleNextStep}
           ariaLabel={isChannel ? 'Continue To Channel Info' : 'Continue To Group Info'}
         >
diff --git a/src/components/left/newChat/NewChatStep2.tsx b/src/components/left/newChat/NewChatStep2.tsx
index 420029793..3fa1b4875 100644
--- a/src/components/left/newChat/NewChatStep2.tsx
+++ b/src/components/left/newChat/NewChatStep2.tsx
@@ -154,15 +154,19 @@ const NewChatStep2: FC<OwnProps & StateProps & DispatchProps> = ({
           <p className="error">{renderedError}</p>
         )}
 
-        <h3 className="chat-members-heading">{lang('GroupInfo.ParticipantCount', memberIds.length, 'i')}</h3>
+        {memberIds.length > 0 && (
+          <>
+            <h3 className="chat-members-heading">{lang('GroupInfo.ParticipantCount', memberIds.length, 'i')}</h3>
 
-        <div className="chat-members-list custom-scroll">
-          {memberIds.map((id) => (
-            <ListItem inactive className="chat-item-clickable">
-              <PrivateChatInfo userId={id} />
-            </ListItem>
-          ))}
-        </div>
+            <div className="chat-members-list custom-scroll">
+              {memberIds.map((id) => (
+                <ListItem inactive className="chat-item-clickable">
+                  <PrivateChatInfo userId={id} />
+                </ListItem>
+              ))}
+            </div>
+          </>
+        )}
       </div>
 
       <FloatingActionButton