diff --git a/umbraco/cms/businesslogic/skinning/controls/ColorPicker.cs b/umbraco/cms/businesslogic/skinning/controls/ColorPicker.cs
index 4b50243838..ddefa66efb 100644
--- a/umbraco/cms/businesslogic/skinning/controls/ColorPicker.cs
+++ b/umbraco/cms/businesslogic/skinning/controls/ColorPicker.cs
@@ -14,6 +14,13 @@ namespace umbraco.cms.businesslogic.skinning.controls
     [ClientDependency(200,ClientDependencyType.Css, "colorpicker/css/colorpicker.css", "UmbracoClient")]
     public class ColorPicker: TextBox
     {
-        
+
+        protected override void Render(HtmlTextWriter writer)
+        {
+            this.TextMode = System.Web.UI.WebControls.TextBoxMode.SingleLine;
+            this.CssClass = "skinningcolorpicker";
+
+            base.Render(writer);
+        }
     }
 }
diff --git a/umbraco/cms/businesslogic/skinning/dependencies/Color.cs b/umbraco/cms/businesslogic/skinning/dependencies/Color.cs
index 1323b0264f..adb80c7439 100644
--- a/umbraco/cms/businesslogic/skinning/dependencies/Color.cs
+++ b/umbraco/cms/businesslogic/skinning/dependencies/Color.cs
@@ -26,9 +26,7 @@ namespace umbraco.cms.businesslogic.skinning.dependencies
         public override WebControl Editor
         {
             get
-            {
-                cp.TextMode = System.Web.UI.WebControls.TextBoxMode.SingleLine;
-                cp.CssClass = "color";
+            {               
 
                 if (_value.Count > 0 && !string.IsNullOrEmpty(_value[0].ToString()))
                     cp.Text = _value[0].ToString();
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js
index 8485b1fe46..4a6e407296 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js
@@ -1,6 +1,6 @@
 var activecolorpicker;
 
-jQuery('input.color').ColorPicker({
+jQuery('input.skinningcolorpicker').ColorPicker({
     onSubmit: function (hsb, hex, rgb, el) {
         jQuery(el).val('#' + hex);
         jQuery(el).ColorPickerHide();