diff --git a/shell/contents/layout.js b/shell/contents/layout.js
index c5c75fb4..cd7a15e2 100644
--- a/shell/contents/layout.js
+++ b/shell/contents/layout.js
@@ -1,10 +1,15 @@
-var id = createActivity("Homescreen");
+var id = currentActivity();
+if (id.length < 1) {
+    id = createActivity("Homescreen")
+}
+
 var desktopsArray = desktopsForActivity(id);
-print("Reaaaaaally?????? " + desktopsArray.length);
-for( var j = 0; j < desktopsArray.length; j++) {
-    desktopsArray[j].wallpaperPlugin = 'org.kde.color';
-    desktopsArray[j].currentConfigGroup = ["Wallpaper", "General"];
-    print("currently at ... " + desktopsArray[j].currentConfigGroup);
+for (var j = 0; j < desktopsArray.length; j++) {
+    desktopsArray[j].wallpaperPlugin = "org.kde.image";
+    desktopsArray[j].name = "Homescreen" + (j > 0 ? " " + j : "");
+    desktopsArray[j].currentConfigGroup = ["Wallpaper",
+                                           desktopsArray[j].wallpaperPlugin,
+                                           "General"];
     desktopsArray[j].writeConfig("Image", "org.kde.satellite.lockers");
 }