diff --git a/webapp/channels/src/components/browse_channels/browse_channels.scss b/webapp/channels/src/components/browse_channels/browse_channels.scss
index cee7a26783..9d3f9173e7 100644
--- a/webapp/channels/src/components/browse_channels/browse_channels.scss
+++ b/webapp/channels/src/components/browse_channels/browse_channels.scss
@@ -1,6 +1,10 @@
 #browseChannelsModal {
     .modal-dialog {
         margin-top: calc(45vh - 240px) !important;
+
+        @media screen and (max-width: 640px) {
+            margin-top: 0 !important;
+        }
     }
 
     .filter-row--full {
diff --git a/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.scss b/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.scss
index 6e64febfe3..9afec92354 100644
--- a/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.scss
+++ b/webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.scss
@@ -100,8 +100,7 @@
 
         .modal-content {
             display: flex;
-            height: 100vh;
-            max-height: unset;
+            max-height: 100vh;
             flex-direction: column;
             border-radius: unset;
         }
@@ -113,10 +112,15 @@
         }
     }
 
-    @media screen and (max-height: 600px) {
+    @media screen and (max-height: 600px) and (min-width: 768px) {
         .modal-content, .GenericModal__wrapper {
             max-height: 85vh !important;
         }
     }
-    
+
+    @media screen and (max-width: 640px) {
+        .GenericModal__wrapper {
+            max-height: unset !important;
+        }
+    }
 }
diff --git a/webapp/channels/src/components/new_channel_modal/new_channel_modal.scss b/webapp/channels/src/components/new_channel_modal/new_channel_modal.scss
index edbf071c79..ad60b6fc00 100644
--- a/webapp/channels/src/components/new_channel_modal/new_channel_modal.scss
+++ b/webapp/channels/src/components/new_channel_modal/new_channel_modal.scss
@@ -46,6 +46,18 @@
             text-align: left;
         }
     }
+
+    @media screen and (max-width: 640px) {
+        .modal-content .GenericModal__wrapper {
+            display: flex;
+            height: 100vh;
+            flex-direction: column;
+
+            > .modal-body {
+                flex: 1
+            }
+        }
+    }
 }
 
 #new-channel-with-board-tooltip {
@@ -63,3 +75,13 @@
         font-weight: 500;
     }
 }
+
+@media screen and (max-width: 640px) {
+    .app__body {
+        &.announcement-bar--fixed {
+            .new-channel-modal .modal-content .GenericModal__wrapper {
+                height: calc(100vh - 40px);
+            }
+        }
+    }
+}
diff --git a/webapp/channels/src/components/widgets/public-private-selector/public-private-selector.scss b/webapp/channels/src/components/widgets/public-private-selector/public-private-selector.scss
index f9fec5551f..b589921355 100644
--- a/webapp/channels/src/components/widgets/public-private-selector/public-private-selector.scss
+++ b/webapp/channels/src/components/widgets/public-private-selector/public-private-selector.scss
@@ -104,7 +104,7 @@
         }
     }
 
-    @media screen and (max-width: 640px) {
+    @media screen and (max-width: 580px) {
         flex-direction: column;
 
         .public-private-selector-button {
diff --git a/webapp/channels/src/sass/components/_modal.scss b/webapp/channels/src/sass/components/_modal.scss
index 6cd70b3bfd..9955911d0c 100644
--- a/webapp/channels/src/sass/components/_modal.scss
+++ b/webapp/channels/src/sass/components/_modal.scss
@@ -63,10 +63,16 @@
             font-weight: 400;
         }
 
+        .input-wrapper > div {
+            display: flex;
+            flex-direction: column;
+        }
+
         .custom-textarea {
-            height: auto;
-            min-height: 8em;
+            height: auto !important;
+            min-height: 46px;
             max-height: 60vh;
+            flex-basis: 8em;
             -webkit-overflow-scrolling: touch;
             -ms-overflow-style: auto;
             overflow-y: auto;
diff --git a/webapp/channels/src/sass/responsive/_mobile.scss b/webapp/channels/src/sass/responsive/_mobile.scss
index dac0e85d54..54affc2bb0 100644
--- a/webapp/channels/src/sass/responsive/_mobile.scss
+++ b/webapp/channels/src/sass/responsive/_mobile.scss
@@ -70,6 +70,16 @@
             .settings-modal {
                 .modal-body {
                     min-height: 100%;
+
+                    .GenericModal__body {
+                        display: flex;
+                        max-height: 100%;
+
+                        > div {
+                            max-height: 100%;
+                            flex-grow: 1;
+                        }
+                    }
                 }
 
                 &.display--content {
@@ -78,9 +88,22 @@
                     }
 
                     .settings-table {
-                        display: block;
+                        display: flex;
+                        min-height: 0;
+                        max-height: 100%;
 
                         .settings-content {
+                            > div {
+                                display: flex;
+                                max-height: 100%;
+
+                                > div {
+                                    display: flex;
+                                    flex-direction: column;
+                                    flex-grow: 1;
+                                }
+                            }
+
                             .section-min__title {
                                 padding-right: 15px;
                             }
@@ -127,9 +150,6 @@
                         }
 
                         .modal-header {
-                            position: absolute;
-                            z-index: 5;
-                            top: 0;
                             display: flex;
                             width: 100%;
                             background-color: var(--center-channel-bg);
@@ -194,7 +214,7 @@
                             .user-settings {
                                 overflow: auto;
                                 max-height: 100vh;
-                                padding: 100px 20px 30px;
+                                padding: 20px 30px;
                             }
                         }
 
@@ -1415,6 +1435,7 @@
 
         .sidebar-right__body {
             height: calc(100% - 56px);
+            overflow-y: scroll;
         }
     }
 
@@ -1558,7 +1579,7 @@
     }
 
     .filtered-user-list {
-        height: calc(100vh - 80px);
+        height: calc(100vh - 80px) !important;
     }
 
     .more-modal--action {
@@ -1828,6 +1849,37 @@
                 }
             }
         }
+
+        #browseChannelsModal.modal .GenericModal, #userGroupsModal.modal .GenericModal {
+            .GenericModal__wrapper {
+                display: flex;
+                max-height: 100vh;
+                flex-direction: column;
+            }
+
+            .modal-header {
+                min-height: unset;
+                box-shadow: none;
+            
+                .GenericModal__header__text_container .GenericModal__header {
+                    flex-direction: column;
+                    align-items: flex-start;
+    
+                    button {
+                        margin-top: 16px;
+                    }
+                }
+            }
+    
+            .more-modal__dropdown {
+                flex-direction: column;
+                align-items: flex-start;
+    
+                #modalPreferenceContainer #menuWrapper {
+                    padding-left: 0;
+                }
+            }
+        }
     }
 
     .member-div {
diff --git a/webapp/platform/components/src/generic_modal/generic_modal.scss b/webapp/platform/components/src/generic_modal/generic_modal.scss
index c5749aedd3..e042030bd6 100644
--- a/webapp/platform/components/src/generic_modal/generic_modal.scss
+++ b/webapp/platform/components/src/generic_modal/generic_modal.scss
@@ -137,13 +137,13 @@
                 }
             }
         }
+    }
 
-        @media screen and (max-width: 640px) {
-            margin: 0 !important;
+    @media screen and (max-width: 640px) {
+        margin: 0 !important;
 
-            .modal-header {
-                box-shadow: var(--elevation-2);
-            }
+        .modal-header {
+            box-shadow: var(--elevation-2);
         }
     }