diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java
index 672a1fc0a..c8b7d1faa 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java
@@ -19,6 +19,9 @@ import javax.swing.JSeparator;
 import javax.swing.JTabbedPane;
 import javax.swing.JTextArea;
 import javax.swing.SwingConstants;
+import javax.swing.colorchooser.ColorSelectionModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.gui.adaptors.BooleanModel;
@@ -57,28 +60,61 @@ public class PhotoSettingsConfig extends JTabbedPane {
 			this.o = o;
 		}
 
+		/**
+		 Changes the color of the selected component to <color>
+		 @param color: color to change the component to
+		 */
+		private void changeComponentColor(Color color) {
+			try {
+				final Method setMethod = o.getClass().getMethod("set" + valueName, net.sf.openrocket.util.Color.class);
+				if (color == null)
+					return;
+				try {
+					setMethod.invoke(o, ColorConversion.fromAwtColor(color));
+				} catch (Throwable e1) {
+					Application.getExceptionHandler().handleErrorCondition(e1);
+				}
+			} catch (Throwable e1) {
+				Application.getExceptionHandler().handleErrorCondition(e1);
+			}
+
+		}
+
+
 		@Override
 		public void actionPerformed(ActionEvent colorClickEvent) {
 			try {
 				final Method getMethod = o.getClass().getMethod("get" + valueName);
-				final Method setMethod = o.getClass().getMethod("set" + valueName, net.sf.openrocket.util.Color.class);
 				net.sf.openrocket.util.Color c = (net.sf.openrocket.util.Color) getMethod.invoke(o);
 				Color awtColor = ColorConversion.toAwtColor(c);
 				colorChooser.setColor(awtColor);
+
+				// Bind a change of color selection to a change in the components color
+				ColorSelectionModel model = colorChooser.getSelectionModel();
+				ChangeListener changeListener = new ChangeListener() {
+					public void stateChanged(ChangeEvent changeEvent) {
+						Color selected = colorChooser.getColor();
+						changeComponentColor(selected);
+					}
+				};
+				model.addChangeListener(changeListener);
+
 				JDialog d = JColorChooser.createDialog(PhotoSettingsConfig.this,
 						trans.get("PhotoSettingsConfig.colorChooser.title"), true, colorChooser, new ActionListener() {
 							@Override
 							public void actionPerformed(ActionEvent okEvent) {
-								Color selected = colorChooser.getColor();
-								if (selected == null)
-									return;
-								try {
-									setMethod.invoke(o, ColorConversion.fromAwtColor(selected));
-								} catch (Throwable e1) {
-									Application.getExceptionHandler().handleErrorCondition(e1);
-								}
+								changeComponentColor(colorChooser.getColor());
+								// Unbind listener to avoid the current component's appearance to change with other components
+								model.removeChangeListener(changeListener);
 							}
-						}, null);
+						}, new ActionListener() {
+							@Override
+							public void actionPerformed(ActionEvent e) {
+								changeComponentColor(awtColor);
+								// Unbind listener to avoid the current component's appearance to change with other components
+								model.removeChangeListener(changeListener);
+							}
+						});
 				d.setVisible(true);
 			} catch (Throwable e1) {
 				Application.getExceptionHandler().handleErrorCondition(e1);