diff --git a/containment.cpp b/containment.cpp
index a52e827e4..24572186c 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -1184,8 +1184,9 @@ void Containment::setDrawWallpaper(bool drawWallpaper)
     d->drawWallpaper = drawWallpaper;
     if (d->drawWallpaper) {
         KConfigGroup cfg = config();
-        setWallpaper(cfg.readEntry("wallpaperplugin", defaultWallpaper),
-                     cfg.readEntry("wallpaperpluginmode", defaultWallpaperMode));
+        QString wallpaper = cfg.readEntry("wallpaperplugin", defaultWallpaper);
+        QString mode = cfg.readEntry("wallpaperpluginmode", defaultWallpaperMode);
+        setWallpaper(wallpaper, mode);
     } else if (!d->drawWallpaper && d->wallpaper) {
         delete d->wallpaper;
         d->wallpaper = 0;
diff --git a/containment.h b/containment.h
index 09a824740..6e7cfbd42 100644
--- a/containment.h
+++ b/containment.h
@@ -495,6 +495,7 @@ class PLASMA_EXPORT Containment : public Applet
         Q_PRIVATE_SLOT(d, void toggleDesktopImmutability())
 
         friend class Applet;
+        friend class CoronaPrivate;
         friend class ContainmentPrivate;
         ContainmentPrivate* const d;
 };
diff --git a/corona.cpp b/corona.cpp
index 066708bed..b5c1a1cff 100644
--- a/corona.cpp
+++ b/corona.cpp
@@ -136,6 +136,10 @@ public:
             delete applet;
             containment = new Containment(0, 0, id);
 
+            if (pluginName == "null") {
+                containment->setDrawWallpaper(false);
+            }
+
             // we want to provide something and don't care about the failure to launch
             containment->setFailedToLaunch(false);
             containment->setFormFactor(Plasma::Planar);