diff --git a/webapp/channels/src/components/add_groups_to_channel_modal/__snapshots__/add_groups_to_channel_modal.test.tsx.snap b/webapp/channels/src/components/add_groups_to_channel_modal/__snapshots__/add_groups_to_channel_modal.test.tsx.snap
index 36b7c687aa..a95bd53ae8 100644
--- a/webapp/channels/src/components/add_groups_to_channel_modal/__snapshots__/add_groups_to_channel_modal.test.tsx.snap
+++ b/webapp/channels/src/components/add_groups_to_channel_modal/__snapshots__/add_groups_to_channel_modal.test.tsx.snap
@@ -96,6 +96,7 @@ exports[`components/AddGroupsToChannelModal should match snapshot 1`] = `
           "current": null,
         }
       }
+      showInputByDefault={false}
       valueRenderer={[Function]}
       valueWithImage={false}
       values={Array []}
diff --git a/webapp/channels/src/components/add_groups_to_team_modal/__snapshots__/add_groups_to_team_modal.test.tsx.snap b/webapp/channels/src/components/add_groups_to_team_modal/__snapshots__/add_groups_to_team_modal.test.tsx.snap
index afc946b376..81eefd6f49 100644
--- a/webapp/channels/src/components/add_groups_to_team_modal/__snapshots__/add_groups_to_team_modal.test.tsx.snap
+++ b/webapp/channels/src/components/add_groups_to_team_modal/__snapshots__/add_groups_to_team_modal.test.tsx.snap
@@ -133,6 +133,7 @@ exports[`components/AddGroupsToTeamModal should match snapshot 1`] = `
           "current": null,
         }
       }
+      showInputByDefault={false}
       valueRenderer={[Function]}
       valueWithImage={false}
       values={Array []}
diff --git a/webapp/channels/src/components/add_user_to_group_multiselect/__snapshots__/add_user_to_group_multiselect.test.tsx.snap b/webapp/channels/src/components/add_user_to_group_multiselect/__snapshots__/add_user_to_group_multiselect.test.tsx.snap
index 1d43451063..679a617e2b 100644
--- a/webapp/channels/src/components/add_user_to_group_multiselect/__snapshots__/add_user_to_group_multiselect.test.tsx.snap
+++ b/webapp/channels/src/components/add_user_to_group_multiselect/__snapshots__/add_user_to_group_multiselect.test.tsx.snap
@@ -79,6 +79,7 @@ exports[`component/add_user_to_group_multiselect should match snapshot with diff
       "current": null,
     }
   }
+  showInputByDefault={false}
   valueWithImage={true}
   values={Array []}
 />
@@ -163,6 +164,7 @@ exports[`component/add_user_to_group_multiselect should match snapshot with prof
       "current": null,
     }
   }
+  showInputByDefault={false}
   valueWithImage={true}
   values={Array []}
 />
@@ -232,6 +234,7 @@ exports[`component/add_user_to_group_multiselect should match snapshot without a
       "current": null,
     }
   }
+  showInputByDefault={false}
   valueWithImage={true}
   values={Array []}
 />
diff --git a/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap b/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap
index ac88890e2d..24f15d8c80 100644
--- a/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap
+++ b/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap
@@ -218,6 +218,7 @@ exports[`components/admin_console/add_users_to_team_modal/AddUsersToTeamModal sh
           "current": null,
         }
       }
+      showInputByDefault={false}
       valueRenderer={[Function]}
       valueWithImage={false}
       values={Array []}
@@ -444,6 +445,7 @@ exports[`components/admin_console/add_users_to_team_modal/AddUsersToTeamModal sh
           "current": null,
         }
       }
+      showInputByDefault={false}
       valueRenderer={[Function]}
       valueWithImage={false}
       values={Array []}
diff --git a/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap b/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap
index 0bbdd7da7b..ce6dd9e4ea 100644
--- a/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap
@@ -172,6 +172,7 @@ exports[`admin_console/add_users_to_role_modal search should not include bot use
       saveButtonPosition="top"
       saving={false}
       savingEnabled={true}
+      showInputByDefault={false}
       valueRenderer={[Function]}
       valueWithImage={false}
       values={Array []}
@@ -308,6 +309,7 @@ exports[`admin_console/add_users_to_role_modal should exclude user 1`] = `
       saveButtonPosition="top"
       saving={false}
       savingEnabled={true}
+      showInputByDefault={false}
       valueRenderer={[Function]}
       valueWithImage={false}
       values={Array []}
@@ -488,6 +490,7 @@ exports[`admin_console/add_users_to_role_modal should have single passed value 1
       saveButtonPosition="top"
       saving={false}
       savingEnabled={true}
+      showInputByDefault={false}
       valueRenderer={[Function]}
       valueWithImage={false}
       values={Array []}
@@ -709,6 +712,7 @@ exports[`admin_console/add_users_to_role_modal should include additional user 1`
       saveButtonPosition="top"
       saving={false}
       savingEnabled={true}
+      showInputByDefault={false}
       valueRenderer={[Function]}
       valueWithImage={false}
       values={Array []}
@@ -930,6 +934,7 @@ exports[`admin_console/add_users_to_role_modal should include additional user 2`
       saveButtonPosition="top"
       saving={false}
       savingEnabled={true}
+      showInputByDefault={false}
       valueRenderer={[Function]}
       valueWithImage={false}
       values={Array []}
@@ -1110,6 +1115,7 @@ exports[`admin_console/add_users_to_role_modal should not include bot user 1`] =
       saveButtonPosition="top"
       saving={false}
       savingEnabled={true}
+      showInputByDefault={false}
       valueRenderer={[Function]}
       valueWithImage={false}
       values={Array []}
diff --git a/webapp/channels/src/components/channel_invite_modal/__snapshots__/channel_invite_modal.test.tsx.snap b/webapp/channels/src/components/channel_invite_modal/__snapshots__/channel_invite_modal.test.tsx.snap
index 94b64f86c8..7111e7e536 100644
--- a/webapp/channels/src/components/channel_invite_modal/__snapshots__/channel_invite_modal.test.tsx.snap
+++ b/webapp/channels/src/components/channel_invite_modal/__snapshots__/channel_invite_modal.test.tsx.snap
@@ -125,6 +125,7 @@ exports[`components/channel_invite_modal should match snapshot for channel_invit
             "current": null,
           }
         }
+        showInputByDefault={false}
         valueWithImage={true}
         values={Array []}
       />
@@ -263,6 +264,7 @@ exports[`components/channel_invite_modal should match snapshot for channel_invit
             "current": null,
           }
         }
+        showInputByDefault={false}
         valueWithImage={true}
         values={Array []}
       />
@@ -423,6 +425,7 @@ exports[`components/channel_invite_modal should match snapshot with exclude and
             "current": null,
           }
         }
+        showInputByDefault={false}
         valueWithImage={true}
         values={Array []}
       />
diff --git a/webapp/channels/src/components/channel_members_dropdown/__snapshots__/channel_members_dropdown.test.tsx.snap b/webapp/channels/src/components/channel_members_dropdown/__snapshots__/channel_members_dropdown.test.tsx.snap
index d1654d66be..2f2cf374d5 100644
--- a/webapp/channels/src/components/channel_members_dropdown/__snapshots__/channel_members_dropdown.test.tsx.snap
+++ b/webapp/channels/src/components/channel_members_dropdown/__snapshots__/channel_members_dropdown.test.tsx.snap
@@ -63,12 +63,6 @@ exports[`components/channel_members_dropdown should match snapshot for dropdown
     openLeft={true}
     openUp={false}
   >
-    <MenuItemAction
-      id="undefined-make-channel-member"
-      onClick={[Function]}
-      show={true}
-      text="Make Channel Member"
-    />
     <MenuItemAction
       data-testid="removeFromChannel"
       isDangerous={true}
@@ -211,37 +205,10 @@ exports[`components/channel_members_dropdown should match snapshot when user is
 `;
 
 exports[`components/channel_members_dropdown should match snapshot with role change possible 1`] = `
-<MenuWrapper
-  animationComponent={[Function]}
-  className=""
->
-  <button
-    className="dropdown-toggle theme color--link style--none"
-    type="button"
-  >
-    <span
-      className="sr-only"
-    />
-    <span>
-      <MemoizedFormattedMessage
-        defaultMessage="Channel Admin"
-        id="channel_members_dropdown.channel_admin"
-      />
-       
-    </span>
-    <DropdownIcon />
-  </button>
-  <Menu
-    ariaLabel="Change the role of channel member"
-    openLeft={true}
-    openUp={false}
-  >
-    <MenuItemAction
-      id="undefined-make-channel-member"
-      onClick={[Function]}
-      show={true}
-      text="Make Channel Member"
-    />
-  </Menu>
-</MenuWrapper>
+<div>
+  <MemoizedFormattedMessage
+    defaultMessage="Channel Admin"
+    id="channel_members_dropdown.channel_admin"
+  />
+</div>
 `;
diff --git a/webapp/channels/src/components/channel_members_dropdown/channel_members_dropdown.test.tsx b/webapp/channels/src/components/channel_members_dropdown/channel_members_dropdown.test.tsx
index 22b3bf4c35..9a4f1cfd34 100644
--- a/webapp/channels/src/components/channel_members_dropdown/channel_members_dropdown.test.tsx
+++ b/webapp/channels/src/components/channel_members_dropdown/channel_members_dropdown.test.tsx
@@ -11,9 +11,10 @@ import type {ActionResult} from 'mattermost-redux/types/actions';
 
 import ChannelMembersDropdown from 'components/channel_members_dropdown/channel_members_dropdown';
 
-import {mockDispatch} from 'packages/mattermost-redux/test/test_store';
 import {ModalIdentifiers} from 'utils/constants';
 
+import {mockDispatch} from 'packages/mattermost-redux/test/test_store';
+
 jest.mock('react-redux', () => ({
     ...jest.requireActual('react-redux') as typeof import('react-redux'),
     useDispatch: () => mockDispatch,
@@ -53,6 +54,7 @@ describe('components/channel_members_dropdown', () => {
         canRemoveMember: true,
         index: 0,
         totalUsers: 10,
+        hasChannelMembersAdmin: true,
         actions: {
             removeChannelMember: jest.fn().mockImplementation(() => {
                 const error = {
@@ -80,6 +82,7 @@ describe('components/channel_members_dropdown', () => {
                 roles: 'channel_guest',
             },
             canChangeMemberRoles: true,
+            hasChannelMembersAdmin: true,
         };
         const wrapper = shallow(
             <ChannelMembersDropdown {...props}/>,
diff --git a/webapp/channels/src/components/multiselect/__snapshots__/multiselect.test.tsx.snap b/webapp/channels/src/components/multiselect/__snapshots__/multiselect.test.tsx.snap
index cdf6e8ef43..ea47aa545e 100644
--- a/webapp/channels/src/components/multiselect/__snapshots__/multiselect.test.tsx.snap
+++ b/webapp/channels/src/components/multiselect/__snapshots__/multiselect.test.tsx.snap
@@ -179,6 +179,7 @@ exports[`components/multiselect/multiselect MultiSelectList should match snapsho
       page={0}
       perPage={5}
       query=""
+      showInputByDefault={false}
     />
     <div
       className="multi-select__help"
@@ -371,6 +372,7 @@ exports[`components/multiselect/multiselect should match snapshot 1`] = `
       page={0}
       perPage={5}
       query=""
+      showInputByDefault={false}
     />
     <div
       className="multi-select__help"
@@ -553,6 +555,7 @@ exports[`components/multiselect/multiselect should match snapshot for page 2 1`]
       page={1}
       perPage={5}
       query=""
+      showInputByDefault={false}
     />
     <div
       className="multi-select__help"