diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index 714a53b1..2ca03954 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -3493,7 +3493,11 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>
 					<description>When editing component colors, honor the specified 'alpha' value specified on each color individually in addition to the component-level alpha property</description>
-				</org.diylc.appframework.update.Change>	
+				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Color chooser dialog defaults to the existing color value being edited</description>
+				</org.diylc.appframework.update.Change>		
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>Single click to expand and collapse categories in the component tree</description>
diff --git a/diylc/diylc-swing/src/org/diylc/swing/gui/editor/ColorEditor.java b/diylc/diylc-swing/src/org/diylc/swing/gui/editor/ColorEditor.java
index 4ecf74fc..ccddcbce 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/gui/editor/ColorEditor.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/gui/editor/ColorEditor.java
@@ -105,7 +105,7 @@ public class ColorEditor extends JPanel {
 
         @Override
         public void mouseClicked(MouseEvent e) {
-          Color newColor = JColorChooser.showDialog(ColorEditor.this, "Choose Color", getBackground());
+          Color newColor = JColorChooser.showDialog(ColorEditor.this, "Choose Color", colorLabel.getBackground());
           if (newColor != null) {
             property.setChanged(true);
             property.setValue(new Color(newColor.getRGB()));