diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml
index 48d2e2b726958a44cd6e593a72bc9db236296590..fad7b4c7586061fc45881e5b15292dc254541f6e 100644
--- a/resources/qml/dialogs/RoomSettings.qml
+++ b/resources/qml/dialogs/RoomSettings.qml
@@ -100,7 +100,8 @@ ApplicationWindow {
             MatrixText {
                 text: roomSettings.roomName
                 font.pixelSize: fontMetrics.font.pixelSize * 2
-                Layout.alignment: Qt.AlignHCenter
+                Layout.fillWidth: true
+                horizontalAlignment: TextEdit.AlignHCenter
             }
 
             MatrixText {
diff --git a/resources/qml/dialogs/UserProfile.qml b/resources/qml/dialogs/UserProfile.qml
index 73c4e68bff379b191b81cfa747ae6c5e768954b5..60f1eb8daede70039fa86ae2b79ba111a474826b 100644
--- a/resources/qml/dialogs/UserProfile.qml
+++ b/resources/qml/dialogs/UserProfile.qml
@@ -138,6 +138,9 @@ ApplicationWindow {
                 color: TimelineManager.userColor(profile.userid, Nheko.colors.window)
                 font.bold: true
                 Layout.alignment: Qt.AlignHCenter
+                Layout.maximumWidth: parent.width - (Nheko.paddingSmall * 2) - usernameChangeButton.anchors.leftMargin - (usernameChangeButton.width * 2)
+                horizontalAlignment: TextInput.AlignHCenter
+                wrapMode: TextInput.Wrap
                 selectByMouse: true
                 onAccepted: {
                     profile.changeUsername(displayUsername.text);
@@ -145,6 +148,7 @@ ApplicationWindow {
                 }
 
                 ImageButton {
+                    id: usernameChangeButton
                     visible: profile.isSelf
                     anchors.leftMargin: Nheko.paddingSmall
                     anchors.left: displayUsername.right
@@ -183,6 +187,8 @@ ApplicationWindow {
                     text: qsTr("Room: %1").arg(profile.room ? profile.room.roomName : "")
                     ToolTip.text: qsTr("This is a room-specific profile. The user's name and avatar may be different from their global versions.")
                     ToolTip.visible: ma.hovered
+                    Layout.maximumWidth: parent.parent.width - (parent.spacing * 3) - 16
+                    horizontalAlignment: TextEdit.AlignHCenter
 
                     HoverHandler {
                         id: ma