diff --git a/webapp/channels/src/components/create_user_groups_modal/__snapshots__/create_user_groups_modal.test.tsx.snap b/webapp/channels/src/components/create_user_groups_modal/__snapshots__/create_user_groups_modal.test.tsx.snap
index e7f6c4ffec..38fb416e91 100644
--- a/webapp/channels/src/components/create_user_groups_modal/__snapshots__/create_user_groups_modal.test.tsx.snap
+++ b/webapp/channels/src/components/create_user_groups_modal/__snapshots__/create_user_groups_modal.test.tsx.snap
@@ -65,7 +65,6 @@ exports[`component/create_user_groups_modal should match snapshot with back butt
   </ModalHeader>
   <ModalBody
     bsClass="modal-body"
-    className="overflow--visible"
     componentClass="div"
   >
     <div
@@ -184,7 +183,6 @@ exports[`component/create_user_groups_modal should match snapshot without back b
   </ModalHeader>
   <ModalBody
     bsClass="modal-body"
-    className="overflow--visible"
     componentClass="div"
   >
     <div
diff --git a/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.scss b/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.scss
index 28914dafbd..9d9a67282a 100644
--- a/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.scss
+++ b/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.scss
@@ -3,6 +3,10 @@
         margin-top: calc(50vh - 240px);
     }
 
+    .modal-body {
+        overflow: visible;
+    }
+
     .Input___error {
         &.group-error {
             position: absolute;
diff --git a/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.tsx b/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.tsx
index f499c835cd..0f98f6d123 100644
--- a/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.tsx
+++ b/webapp/channels/src/components/create_user_groups_modal/create_user_groups_modal.tsx
@@ -213,9 +213,7 @@ export default class CreateUserGroupsModal extends React.PureComponent<Props, St
                     }
 
                 </Modal.Header>
-                <Modal.Body
-                    className='overflow--visible'
-                >
+                <Modal.Body>
                     <div className='user-groups-modal__content'>
                         <div className='group-name-input-wrapper'>
                             <Input