diff --git a/src/settings/NeoChatGeneralPage.qml b/src/settings/NeoChatGeneralPage.qml
index 913856c1f..0c19c7dcc 100644
--- a/src/settings/NeoChatGeneralPage.qml
+++ b/src/settings/NeoChatGeneralPage.qml
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import QtQuick
+import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
@@ -12,6 +13,10 @@ import org.kde.neochat
 import org.kde.neochat.devtools
 
 FormCard.FormCardPage {
+    id: root
+
+    required property NeoChatConnection connection
+
     title: i18nc("@title:window", "General")
 
     FormCard.FormHeader {
@@ -234,7 +239,7 @@ FormCard.FormCardPage {
         FormCard.FormButtonDelegate {
             visible: Config.developerTools
             text: i18n("Open developer tools")
-            onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
+            onClicked: root.QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
                 connection: root.connection
             }, {
                 title: i18n("Developer Tools")
diff --git a/src/settings/NeoChatSettingsView.qml b/src/settings/NeoChatSettingsView.qml
index 51ec86fd4..f1c7aa272 100644
--- a/src/settings/NeoChatSettingsView.qml
+++ b/src/settings/NeoChatSettingsView.qml
@@ -22,6 +22,11 @@ KirigamiSettings.ConfigurationView {
             text: i18n("General")
             icon.name: "org.kde.neochat"
             page: () => Qt.createComponent("org.kde.neochat.settings", "NeoChatGeneralPage")
+            initialProperties: () => {
+                return {
+                    connection: root.connection
+                };
+            }
         },
         KirigamiSettings.ConfigurationModule {
             moduleId: "appearance"
diff --git a/src/settings/Permissions.qml b/src/settings/Permissions.qml
index c21e09219..130f9b45a 100644
--- a/src/settings/Permissions.qml
+++ b/src/settings/Permissions.qml
@@ -211,7 +211,7 @@ FormCard.FormCardPage {
                                 id: editPowerLevelAction
                                 onTriggered: {
                                     userListSearchPopup.close();
-                                    let dialog = powerLevelDialog.createObject(applicationWindow().overlay, {
+                                    let dialog = powerLevelDialog.createObject(root.QQC2.Overlay.overlay, {
                                         room: root.room,
                                         userId: userListItem.userId,
                                         powerLevel: userListItem.powerLevel
diff --git a/src/settings/RoomGeneralPage.qml b/src/settings/RoomGeneralPage.qml
index a2fff34f7..f9ea7d0f0 100644
--- a/src/settings/RoomGeneralPage.qml
+++ b/src/settings/RoomGeneralPage.qml
@@ -348,7 +348,7 @@ FormCard.FormCardPage {
         FormCard.FormButtonDelegate {
             visible: root.room.canSendState("m.space.parent")
             text: i18nc("@action:button", "Add new official parent")
-            onClicked: selectParentDialog.createObject(applicationWindow().overlay).open()
+            onClicked: selectParentDialog.createObject(QQC2.Overlay.overlay).open()
 
             Component {
                 id: selectParentDialog
diff --git a/src/settings/RoomSecurityPage.qml b/src/settings/RoomSecurityPage.qml
index e8fcbebe6..e7ff68f40 100644
--- a/src/settings/RoomSecurityPage.qml
+++ b/src/settings/RoomSecurityPage.qml
@@ -30,7 +30,7 @@ FormCard.FormCardPage {
             enabled: room.canEncryptRoom
             checked: room.usesEncryption
             onToggled: if (checked) {
-                let dialog = confirmEncryptionDialog.createObject(applicationWindow().overlay, {
+                let dialog = confirmEncryptionDialog.createObject(QQC2.Overlay.overlay, {
                     room: room
                 });
                 dialog.open();
@@ -57,7 +57,7 @@ FormCard.FormCardPage {
             checked: room.joinRule === "restricted"
             enabled: room.canSendState("m.room.join_rules") && ["8", "9", "10"].includes(room.version)
             onCheckedChanged: if (checked && room.joinRule != "restricted") {
-                selectSpacesDialog.createObject(applicationWindow().overlay).open();
+                selectSpacesDialog.createObject(QQC2.Overlay.overlay).open();
             }
 
             contentItem.children: QQC2.Button {
@@ -65,7 +65,7 @@ FormCard.FormCardPage {
                 text: i18n("Select spaces")
                 icon.name: "list-add"
 
-                onClicked: selectSpacesDialog.createObject(applicationWindow().overlay).open()
+                onClicked: selectSpacesDialog.createObject(QQC2.Overlay.overlay).open()
 
                 QQC2.ToolTip.text: text
                 QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay