diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotPanel.java
index 40652475a..70b2c1028 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotPanel.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotPanel.java
@@ -71,7 +71,7 @@ public class CAPlotPanel extends PlotPanel<CADataType, CADataBranch, CADataTypeG
 	@Override
 	protected CAPlotTypeSelector createSelector(int i, CADataType type, Unit unit, int axis) {
 		return new CAPlotTypeSelector(parent, i, type, unit, axis, List.of(typesY),
-				parent.getComponentsForType(type), configuration);
+				parent.getComponentsForType(type), configuration, configuration.getComponent(i));
 	}
 
 	public void setXAxis(CADomainDataType type) {
diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotTypeSelector.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotTypeSelector.java
index d88bf8c95..55a3d8ba4 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotTypeSelector.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotTypeSelector.java
@@ -18,7 +18,8 @@ public class CAPlotTypeSelector extends PlotTypeSelector<CADataType, CADataTypeG
 
 	public CAPlotTypeSelector(final ComponentAnalysisPlotExportPanel parent, int plotIndex,
 							  CADataType type, Unit unit, int position, List<CADataType> availableTypes,
-							  List<RocketComponent> componentsForType, CAPlotConfiguration configuration) {
+							  List<RocketComponent> componentsForType, CAPlotConfiguration configuration,
+							  RocketComponent selectedComponent) {
 		super(plotIndex, type, unit, position, availableTypes, false);
 
 		if (componentsForType.isEmpty()) {
@@ -26,9 +27,11 @@ public class CAPlotTypeSelector extends PlotTypeSelector<CADataType, CADataTypeG
 		}
 
 		// Component selector
+		selectedComponent = selectedComponent != null ? selectedComponent : componentsForType.get(0);
 		this.add(new JLabel(trans.get("CAPlotTypeSelector.lbl.component")));
 		componentSelector = new JComboBox<>(componentsForType.toArray(new RocketComponent[0]));
-		configuration.setPlotDataComponent(plotIndex, componentsForType.get(0));
+		componentSelector.setSelectedItem(selectedComponent);
+		configuration.setPlotDataComponent(plotIndex, selectedComponent);
 		this.add(componentSelector, "gapright para");
 
 		addRemoveButton();
@@ -48,6 +51,12 @@ public class CAPlotTypeSelector extends PlotTypeSelector<CADataType, CADataTypeG
 		});
 	}
 
+	public CAPlotTypeSelector(final ComponentAnalysisPlotExportPanel parent, int plotIndex,
+							  CADataType type, Unit unit, int position, List<CADataType> availableTypes,
+							  List<RocketComponent> componentsForType, CAPlotConfiguration configuration) {
+		this(parent, plotIndex, type, unit, position, availableTypes, componentsForType, configuration, null);
+	}
+
 	public void addComponentSelectionListener(ItemListener listener) {
 		componentSelector.addItemListener(listener);
 	}
diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/PlotPanel.java b/swing/src/main/java/info/openrocket/swing/gui/plot/PlotPanel.java
index db19478f3..91f41a89a 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/plot/PlotPanel.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/plot/PlotPanel.java
@@ -212,7 +212,6 @@ public class PlotPanel<T extends DataType & Groupable<G>,
 				// Select new type smartly
 				T type = null;
 				for (T t : typesY) {
-
 					boolean used = false;
 					if (configuration.getDomainAxisType().equals(t)) {
 						used = true;