diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurableTableModel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurableTableModel.java
index 71541494a..0a83f75a7 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurableTableModel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurableTableModel.java
@@ -88,6 +88,10 @@ public class FlightConfigurableTableModel<T extends FlightConfigurableComponent>
 		}
 	}
 
+	public int getColumnIndex(FlightConfigurableComponent comp) {
+		return components.indexOf(comp);
+	}
+
 	@Override
 	public String getColumnName(int column) {
 		switch (column) {
@@ -103,4 +107,4 @@ public class FlightConfigurableTableModel<T extends FlightConfigurableComponent>
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
index 14e512c58..9bebb3bcc 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
@@ -16,11 +16,8 @@ import javax.swing.SwingUtilities;
 import net.sf.openrocket.formatting.RocketDescriptor;
 import net.sf.openrocket.gui.dialogs.flightconfiguration.DeploymentSelectionDialog;
 import net.sf.openrocket.l10n.Translator;
-import net.sf.openrocket.rocketcomponent.DeploymentConfiguration;
+import net.sf.openrocket.rocketcomponent.*;
 import net.sf.openrocket.rocketcomponent.DeploymentConfiguration.DeployEvent;
-import net.sf.openrocket.rocketcomponent.FlightConfigurationId;
-import net.sf.openrocket.rocketcomponent.RecoveryDevice;
-import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.unit.UnitGroup;
 
@@ -82,6 +79,18 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel<Recovery
 				}
 			}
 		});
+		rocket.addComponentChangeListener(cce -> {
+			final RocketComponent source = cce.getSource();
+			if(source instanceof FlightConfigurableComponent) {
+				final int index = recoveryTableModel.getColumnIndex((FlightConfigurableComponent) source);
+				recoveryTable.getColumnModel().getColumn(index).setHeaderValue(source.getName());
+
+				// you would think this would be enough by itself, but it requires an nudge from the above lines to
+				// actually update.
+				recoveryTable.getTableHeader().resizeAndRepaint();
+			}
+		});
+//		recoveryTable.setColumnModel(recoveryTableModel);
 		recoveryTable.setDefaultRenderer(Object.class, new RecoveryTableCellRenderer());
 
 		return recoveryTable;