diff --git a/lib/OpenLayers/Control/LayerSwitcher.js b/lib/OpenLayers/Control/LayerSwitcher.js
index 3fb05dae09..155978e76c 100644
--- a/lib/OpenLayers/Control/LayerSwitcher.js
+++ b/lib/OpenLayers/Control/LayerSwitcher.js
@@ -8,16 +8,32 @@ OpenLayers.Control.LayerSwitcher.prototype =
     draw: function() {
         // initialize our internal div
         OpenLayers.Control.prototype.draw.apply(this);
+        this.map.events.register("addlayer", this, this.redraw);
+        return this.redraw();    
+    },
+    redraw: function() {
         var pixel = new OpenLayers.Pixel(this.map.div.clientWidth-200,4);
+        this.div.innerHTML = "";
         for(i=0; i<this.map.layers.length; i++) {
-            var div = OpenLayers.Util.createDiv("LayerControl_layer"+i,pixel,new OpenLayers.Size(200,20));
-            div.innerHTML = this.map.layers[i].name;
-            div.style.backgroundColor="white";
-            div.style.padding="5px";
-            div.layerid = i;
-            div.map = this.map;
-            div.ondblclick = this.doubleClick.bindAsEventListener(div);
-            div.onmousedown = this.singleClick.bindAsEventListener(div);
+            var div = $('LayerControl_layer'+i);
+            if (!div) {
+                div = OpenLayers.Util.createDiv("LayerControl_layer"+i,pixel,new OpenLayers.Size(200,20));
+                
+                div.innerHTML = this.map.layers[i].name;
+                var status = this.map.layers[i].getVisibility();
+                if (!status) {
+                    div.style.backgroundColor="black";
+                    div.style.color="white";
+                } else {
+                    div.style.backgroundColor="white";
+                    div.style.color="black";
+                }
+                div.style.padding="5px";
+                div.layerid = i;
+                div.map = this.map;
+                div.ondblclick = this.doubleClick.bindAsEventListener(div);
+                div.onmousedown = this.singleClick.bindAsEventListener(div);
+            }
             this.div.appendChild(div);
             pixel = pixel.add(0, 35);
         }