diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index ca82b82ee14..cc2676713d6 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -20,15 +20,31 @@ limitations under the License.
     }
 
     .mx_Dialog_fixedWidth {
-        overflow-y: hidden;
-        height: 100%;
+        display: flex;
+        flex-flow: column;
+        height: 100%; // to put the button on the bottom of the dialog
+
+        .mx_DevTools_content {
+            margin: 10px 0;
+            height: 100%;
+        }
+
+        .mx_Dialog_buttons {
+            margin-top: 0;
+            display: flex;
+            justify-content: flex-end;
+            gap: 5px 8px; // emulate the margin rules on _common.scss
+
+            button {
+                box-sizing: border-box;
+                margin: 0 !important; // override the rules on _common.scss
+            }
+        }
     }
-}
 
-.mx_DevTools_content {
-    margin: 10px 0;
-    overflow-y: auto;
-    height: calc(100% - 124px); // 58px for buttons + 50px for header + 8px margin around
+    .mx_DevTools_content {
+        overflow-y: auto;
+    }
 }
 
 .mx_DevTools_RoomStateExplorer_query {
diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
index 35fedd7cf28..19883de6884 100644
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -136,6 +136,7 @@ limitations under the License.
             flex-shrink: 1;
             overflow: hidden;
             text-overflow: ellipsis;
+            white-space: nowrap;
         }
     }
 }
@@ -295,7 +296,35 @@ limitations under the License.
 
 .mx_InviteDialog_content {
     height: calc(100% - 36px); // full height minus the size of the header
-    overflow: hidden;
+}
+
+.mx_Dialog {
+    .mx_InviteDialog_content {
+        overflow: hidden;
+    }
+
+    // Disable overflow:hidden on the invite dialog with footer, except the transfer dialog
+    div:not(.mx_InviteDialog_transfer).mx_InviteDialog_hasFooter {
+        .mx_InviteDialog_content {
+            display: flex;
+            flex-flow: column;
+        }
+
+        .mx_InviteDialog_footer {
+            position: relative;
+            bottom: 0;
+
+            .mx_CopyableText {
+                width: 100%;
+                box-sizing: border-box;
+            }
+        }
+
+        .mx_InviteDialog_userSections {
+            height: 100%;
+            padding-inline-end: 0;
+        }
+    }
 }
 
 .mx_InviteDialog_transfer {
@@ -322,9 +351,9 @@ limitations under the License.
 }
 
 .mx_InviteDialog_userSections {
-    margin-top: 4px;
+    margin: 4px 0;
     overflow-y: auto;
-    padding: 0 45px 4px 0;
+    padding: 0 45px 0 0;
 }
 
 .mx_InviteDialog_hasFooter .mx_InviteDialog_userSections {