diff --git a/lib/OpenLayers/Control.js b/lib/OpenLayers/Control.js
index 75cb6dbfe2..612772771c 100644
--- a/lib/OpenLayers/Control.js
+++ b/lib/OpenLayers/Control.js
@@ -8,6 +8,9 @@
 OpenLayers.Control = Class.create();
 OpenLayers.Control.prototype = {
 
+    /** @type String */
+    id: null,
+    
     /** this gets set in the addControl() function in OpenLayers.Map
     * @type OpenLayers.Map */
     map: null,
@@ -57,6 +60,10 @@ OpenLayers.Control.prototype = {
     draw: function (px) {
         if (this.div == null) {
             this.div = OpenLayers.Util.createDiv();
+            this.div.id = "Control";
+            if (this.id != null) {
+                this.div.id += "_" + this.id;
+            }
         }
         if (px != null) {
             this.position = px.clone();
diff --git a/lib/OpenLayers/Control/LayerSwitcher.js b/lib/OpenLayers/Control/LayerSwitcher.js
index 89453e90bb..fb23d78b8c 100644
--- a/lib/OpenLayers/Control/LayerSwitcher.js
+++ b/lib/OpenLayers/Control/LayerSwitcher.js
@@ -11,6 +11,10 @@ OpenLayers.Control.LayerSwitcher = Class.create();
 OpenLayers.Control.LayerSwitcher.prototype = 
   Object.extend( new OpenLayers.Control(), {
 
+    /** For div.id
+     * @type String */
+    id:  "LayerSwitcher",
+
     /** @type String */
     activeColor: "darkblue",
     
diff --git a/lib/OpenLayers/Control/LayerTabs.js b/lib/OpenLayers/Control/LayerTabs.js
index 911d91876c..619f4c4974 100644
--- a/lib/OpenLayers/Control/LayerTabs.js
+++ b/lib/OpenLayers/Control/LayerTabs.js
@@ -27,6 +27,10 @@ OpenLayers.Control.LayerTabs.NONACTIVE_COLOR = "lightblue";
 OpenLayers.Control.LayerTabs.prototype = 
   Object.extend( new OpenLayers.Control(), {
 
+    /** For div.id
+     * @type String */
+    id:  "LayerTabs",
+
     /** @type String */
     activeColor: "",
     
diff --git a/lib/OpenLayers/Control/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js
index 99158913be..cf612bc3f0 100644
--- a/lib/OpenLayers/Control/MouseToolbar.js
+++ b/lib/OpenLayers/Control/MouseToolbar.js
@@ -15,6 +15,10 @@ OpenLayers.Control.MouseToolbar.prototype =
   Object.extend( new OpenLayers.Control(), 
     Object.extend( new OpenLayers.Control.MouseDefaults(), {
     
+    /** For div.id
+     * @type String */
+    id:  "MouseToolbar",
+
     mode: null,
 
     buttons: null,
diff --git a/lib/OpenLayers/Control/PanZoom.js b/lib/OpenLayers/Control/PanZoom.js
index 2f18cf3238..c0b11e0ac0 100644
--- a/lib/OpenLayers/Control/PanZoom.js
+++ b/lib/OpenLayers/Control/PanZoom.js
@@ -13,6 +13,10 @@ OpenLayers.Control.PanZoom.Y = 4;
 OpenLayers.Control.PanZoom.prototype = 
   Object.extend( new OpenLayers.Control(), {
 
+    /** For div.id
+     * @type String */
+    id:  "PanZoom",
+
     /** @type int */
     slideFactor: 50,
 
diff --git a/lib/OpenLayers/Control/PanZoomBar.js b/lib/OpenLayers/Control/PanZoomBar.js
index 707ee1bd09..d692741f00 100644
--- a/lib/OpenLayers/Control/PanZoomBar.js
+++ b/lib/OpenLayers/Control/PanZoomBar.js
@@ -12,6 +12,11 @@ OpenLayers.Control.PanZoomBar.X = 4;
 OpenLayers.Control.PanZoomBar.Y = 4;
 OpenLayers.Control.PanZoomBar.prototype = 
   Object.extend( new OpenLayers.Control.PanZoom(), {
+
+    /** For div.id
+     * @type String */
+    id:  "PanZoomBar",
+
     /** @type Array(...) */
     buttons: null,
 
diff --git a/lib/OpenLayers/Control/Permalink.js b/lib/OpenLayers/Control/Permalink.js
index 0c7feb1202..e5b1df712b 100644
--- a/lib/OpenLayers/Control/Permalink.js
+++ b/lib/OpenLayers/Control/Permalink.js
@@ -11,6 +11,10 @@ OpenLayers.Control.Permalink = Class.create();
 OpenLayers.Control.Permalink.prototype = 
   Object.extend( new OpenLayers.Control(), {
 
+    /** For div.id
+     * @type String */
+    id:  "Permalink",
+
     /** @type DOMElement */
     element: null,
     
diff --git a/lib/OpenLayers/Control/Scale.js b/lib/OpenLayers/Control/Scale.js
index 95bc2ee745..6c5a39bad5 100644
--- a/lib/OpenLayers/Control/Scale.js
+++ b/lib/OpenLayers/Control/Scale.js
@@ -13,6 +13,10 @@ OpenLayers.Control.Scale.prototype =
     /** @type DOMElement */
     element: null,
     
+    /** For div.id
+     * @type String */
+    id:  "Scale",
+
     /**
      * @constructor
      *