diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index 6963f8a160..2575169664 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -180,10 +180,6 @@ limitations under the License.
     line-height: 2em;
 }
 
-.mx_GroupView > .mx_MainSplit {
-    flex: 1;
-}
-
 .mx_GroupView_body {
     flex-grow: 1;
 }
diff --git a/res/css/structures/_MyGroups.scss b/res/css/structures/_MyGroups.scss
index 9556fd57e3..47a5ea5a77 100644
--- a/res/css/structures/_MyGroups.scss
+++ b/res/css/structures/_MyGroups.scss
@@ -95,6 +95,11 @@ limitations under the License.
 
     display: flex;
     flex-direction: column;
+    overflow-y: auto;
+}
+
+.mx_MyGroups_scrollable {
+    overflow-y: inherit;
 }
 
 .mx_MyGroups_content,
diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 77f016f05f..03f5ce230c 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -23,6 +23,7 @@ limitations under the License.
     flex-direction: column;
     align-items: center;
     justify-content: space-between;
+    height: 100%;
 }
 
 .mx_TagPanel_items_selected {
@@ -58,7 +59,6 @@ limitations under the License.
 .mx_TagPanel .mx_TagPanel_scroller {
     flex-grow: 1;
     width: 100%;
-    height: 100vh;
 }
 
 .mx_TagPanel .mx_TagPanel_tagTileContainer {
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index b7efa2d00a..f75fc86fc8 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -72,7 +72,7 @@ export default createReactClass({
             });
             contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />;
             content = groupNodes.length > 0 ?
-                <div className="mx_MyGroups_scrollable">
+                <div className="mx_MyGroups_scrollable mx_AutoHideScrollbar">
                     <div className="mx_MyGroups_microcopy">
                         <p>
                             { _t(