diff --git a/src/qml/RoomData.qml b/src/qml/RoomData.qml
index 291d46c77..4900dd458 100644
--- a/src/qml/RoomData.qml
+++ b/src/qml/RoomData.qml
@@ -30,7 +30,7 @@ ColumnLayout {
                 id: roomListModel
                 connection: root.connection
             }
-            currentIndex: -1
+            currentIndex: 0
             Component.onCompleted: currentIndex = roomListModel.rowForRoom(root.room)
             onCurrentValueChanged: root.room = roomListModel.roomByAliasOrId(roomComboBox.currentValue)
         }
diff --git a/src/qml/RoomInformation.qml b/src/qml/RoomInformation.qml
index 119452649..9d62939dd 100644
--- a/src/qml/RoomInformation.qml
+++ b/src/qml/RoomInformation.qml
@@ -72,25 +72,6 @@ QQC2.ScrollView {
                 Layout.fillWidth: true
             }
 
-            Delegates.RoundedItemDelegate {
-                id: devtoolsButton
-
-                icon.name: "tools"
-                text: i18n("Open developer tools")
-                visible: Config.developerTools && !root.room.isSpace
-
-                Layout.fillWidth: true
-
-                onClicked: {
-                    applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'DevtoolsPage.qml'), {
-                        room: root.room,
-                        connection: root.connection
-                    }, {
-                        title: i18n("Developer Tools")
-                    });
-                }
-            }
-
             Delegates.RoundedItemDelegate {
                 id: searchButton
                 visible: !root.room.isSpace
diff --git a/src/qml/ServerData.qml b/src/qml/ServerData.qml
index 894ca1e59..51216a35f 100644
--- a/src/qml/ServerData.qml
+++ b/src/qml/ServerData.qml
@@ -38,7 +38,7 @@ ColumnLayout {
     }
     FormCard.FormCard {
         Repeater {
-            model: room.connection.getSupportedRoomVersions()
+            model: root.connection.getSupportedRoomVersions()
 
             delegate: FormCard.FormTextDelegate {
                 text: modelData.id
diff --git a/src/qml/UserInfo.qml b/src/qml/UserInfo.qml
index 49c026b4c..8b9db45a5 100644
--- a/src/qml/UserInfo.qml
+++ b/src/qml/UserInfo.qml
@@ -118,6 +118,22 @@ RowLayout {
         Layout.alignment: Qt.AlignRight
         visible: false
     }
+    QQC2.ToolButton {
+        visible: Config.developerTools
+        icon.name: "tools"
+        onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'DevtoolsPage.qml'), {
+            connection: root.connection
+        }, {
+            title: i18n("Developer Tools")
+        });
+        text: i18n("Open developer tools")
+        display: QQC2.AbstractButton.IconOnly
+        Layout.minimumWidth: Layout.preferredWidth
+        Layout.alignment: Qt.AlignRight
+        QQC2.ToolTip.text: text
+        QQC2.ToolTip.visible: hovered
+        QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+    }
     QQC2.ToolButton {
         icon.name: "settings-configure"
         onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'SettingsPage.qml'), {