diff --git a/src/app/qml/AttachmentPane.qml b/src/app/qml/AttachmentPane.qml
index eaa4e6fb1..71a9f852f 100644
--- a/src/app/qml/AttachmentPane.qml
+++ b/src/app/qml/AttachmentPane.qml
@@ -46,7 +46,7 @@ ColumnLayout {
             }
 
             onClicked: {
-                let imageEditor = applicationWindow().pageStack.pushDialogLayer(imageEditorPage);
+                let imageEditor = (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(imageEditorPage);
                 imageEditor.newPathChanged.connect(function (newPath) {
                     applicationWindow().pageStack.layers.pop();
                     root.attachmentPath = newPath;
diff --git a/src/rooms/SpaceDrawer.qml b/src/rooms/SpaceDrawer.qml
index f00e28800..5138f2594 100644
--- a/src/rooms/SpaceDrawer.qml
+++ b/src/rooms/SpaceDrawer.qml
@@ -288,7 +288,7 @@ QQC2.Control {
                     activeFocusOnTab: true
 
                     onSelected: {
-                        let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
+                        let dialog = (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
                             connection: root.connection,
                             keyword: RoomManager.sortFilterRoomTreeModel.filterText
                         }, {