diff --git a/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml b/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml
index 1fe0b239..038e336a 100644
--- a/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml
+++ b/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml
@@ -22,7 +22,7 @@ GridView {
     clip: true
     
     readonly property int reservedSpaceForLabel: metrics.height
-    readonly property real effectiveContentWidth: width - leftMargin - rightMargin
+    required property real effectiveContentWidth
     
     cellWidth: effectiveContentWidth / Math.min(Math.floor(effectiveContentWidth / (PlasmaCore.Units.iconSizes.huge + Kirigami.Units.largeSpacing * 2)), 8)
     cellHeight: cellWidth + reservedSpaceForLabel
diff --git a/containments/homescreens/halcyon/package/contents/ui/HomeScreen.qml b/containments/homescreens/halcyon/package/contents/ui/HomeScreen.qml
index 2204eb2b..185f351b 100644
--- a/containments/homescreens/halcyon/package/contents/ui/HomeScreen.qml
+++ b/containments/homescreens/halcyon/package/contents/ui/HomeScreen.qml
@@ -164,6 +164,7 @@ Item {
                 interactive: root.interactive
                 leftMargin: column.horizontalMargin
                 rightMargin: column.horizontalMargin
+                effectiveContentWidth: swipeView.width - leftMargin - rightMargin
                 Layout.fillWidth: true
                 Layout.fillHeight: true
             }
diff --git a/shell/contents/configuration/ContainmentConfiguration.qml b/shell/contents/configuration/ContainmentConfiguration.qml
index 61a99515..5137c3b3 100644
--- a/shell/contents/configuration/ContainmentConfiguration.qml
+++ b/shell/contents/configuration/ContainmentConfiguration.qml
@@ -34,10 +34,15 @@ AppletConfiguration {
     }
 //END model
 
+    // the wallpaper selector is quite heavy, so only load it when needed
     Loader {
         id: wallpaperSelectorLoader
         asynchronous: true
-        active: true
+        active: false
+        
+        onLoaded: {
+            wallpaperSelectorLoader.item.open();
+        }
         
         sourceComponent: WallpaperSelector {
             visible: false
@@ -88,7 +93,7 @@ AppletConfiguration {
                         opacityAnim.from = 1;
                         opacityAnim.to = 0;
                         opacityAnim.restart();
-                        wallpaperSelectorLoader.item.open();
+                        wallpaperSelectorLoader.active = true;
                     }
                 }
                 
@@ -104,7 +109,6 @@ AppletConfiguration {
                     text: i18n("Configure")
                     onClicked: {
                         appComponent.visible = true;
-                        wallpaperSelectorLoader.item.close()
                     }
                 }
             }