diff --git a/nymea-app/ui/RootItem.qml b/nymea-app/ui/RootItem.qml
index 60e85991..61706e45 100644
--- a/nymea-app/ui/RootItem.qml
+++ b/nymea-app/ui/RootItem.qml
@@ -70,12 +70,9 @@ Item {
                 id: mainRepeater
                 model: tabModel
 
-                delegate: StackView {
-                    id: pageStack
+                delegate: Item {
                     height: swipeView.height
                     width: swipeView.width
-                    objectName: "pageStack"
-                    initialItem: Page {}
 
                     property var tabSettings: Settings {
                         category: "tabSettings" + index
@@ -103,6 +100,13 @@ Item {
                         value: engine.connection.currentHost === null
                     }
 
+                    StackView {
+                        id: pageStack
+                        objectName: "pageStack"
+                        anchors.fill: parent
+                        initialItem: Page {}
+                    }
+
                     Component.onCompleted: {
                         setupPushNotifications();
                         if (autoConnectHost.length > 0) {