diff --git a/lib/OpenLayers/Control.js b/lib/OpenLayers/Control.js
index bb9bd58b35..4548572b42 100644
--- a/lib/OpenLayers/Control.js
+++ b/lib/OpenLayers/Control.js
@@ -25,8 +25,6 @@ OpenLayers.Control.prototype = {
         if (this.div == null) {
             this.div = OpenLayers.Util.createDiv();
         }
-        this.div.style.zIndex = this.map.Z_INDEX_BASE['Control'] +
-                                this.map.controls.length;
         return this.div;
     },
 
diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index e81fc5d6f2..b16c195e49 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -139,6 +139,8 @@ OpenLayers.Map.prototype = {
         this.controls.push(control);
         var div = control.draw();
         if (div) {
+            div.style.zIndex = this.Z_INDEX_BASE['Control'] +
+                                this.controls.length;
             this.viewPortDiv.appendChild( div );
         }
     },