diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
index 73deea83f..39490f44e 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
@@ -229,6 +229,11 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 					T component = v.getV();
 					label = format(component, fcid, label );
 				}
+				for (Component c : label.getComponents()) {
+					if (c instanceof JLabel) {
+						setSelected((JLabel)c, table, isSelected, hasFocus);
+					}
+				}
 				setSelected(label, table, isSelected, hasFocus);
 				return label;
 			}
@@ -242,7 +247,7 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 				c.setForeground((Color)UIManager.get("Table.selectionForeground"));
 			} else {
 				c.setBackground(table.getBackground());
-				c.setForeground(table.getForeground());
+				c.setForeground(c.getForeground());
 			}
 			Border b = null;
 			if ( hasFocus ) {
diff --git a/swing/src/net/sf/openrocket/gui/widgets/SelectColorToggleButton.java b/swing/src/net/sf/openrocket/gui/widgets/SelectColorToggleButton.java
index b2fc4bea2..96f2cceaa 100644
--- a/swing/src/net/sf/openrocket/gui/widgets/SelectColorToggleButton.java
+++ b/swing/src/net/sf/openrocket/gui/widgets/SelectColorToggleButton.java
@@ -1,11 +1,17 @@
 package net.sf.openrocket.gui.widgets;
 
-import net.sf.openrocket.gui.components.StageSelector;
-
-import javax.swing.*;
+import javax.swing.JToggleButton;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.UIManager;
 import java.awt.Graphics;
-import java.awt.Color;
 
+/**
+ * This class is a replacement for the standard JToggleButton. Its purpose is to be able
+ * to control the foreground color for when the button is (de)selected.
+ *
+ * @author Sibo Van Gool <sibo.vangool@hotmail.com>
+ */
 public class SelectColorToggleButton extends JToggleButton {
     public SelectColorToggleButton(Action a) {
         super(a);